From: Vladimir Khlyunev <vkhlyunev@mirantis.com>
Date: Fri, 22 Mar 2019 06:32:58 +0000 (+0400)
Subject: Enhance deploy_heat_stack job
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F31%2F40831%2F2;p=tools%2Fsustaining.git

Enhance deploy_heat_stack job

Use macro for refspec fetching. Also remove duplicate parameter

Change-Id: Ic6978364411792fd53d704376cc7f5fd87cc8889
---

diff --git a/maintenance-ci/common/jobs/deploy-stack.yaml b/maintenance-ci/common/jobs/deploy-stack.yaml
index 8f56d1c..c2eb3f0 100644
--- a/maintenance-ci/common/jobs/deploy-stack.yaml
+++ b/maintenance-ci/common/jobs/deploy-stack.yaml
@@ -13,10 +13,6 @@
             - "maintenance-ci/common/data/jenkins-slave.yml"
             - "maintenance-ci/common/data/mos-slave.yml"
             - "maintenance-ci/common/data/mos-dev-slave.yml"
-    - string:
-        name: HEAT_STACK_YAML
-        description: "Stack yaml file"
-        default: "maintenance-ci/common/data/jenkins-slave.yml"
     - string:
         name: STACK_PREFIX
         description: "Stack prefix"
@@ -24,9 +20,14 @@
     - string:
         name: FLAVOR_NAME
         default: "dev.share"
+        description: |
+          Flavor name to use. MOS-related flavors are:
+            - mos.fuel.base (43gb ram)
+            - mos.fuel.huge (80gb ram)
+            - mos.tempest (128gb ram)
     - string:
         name: IMAGE_NAME
-        default: maintenance-ci-base-slave
+        default: maintenance-ci-base-image
     - string:
         name: JENKINS_LABELS
         default: ''
@@ -48,6 +49,7 @@
         timeout: 30
 
     builders:
+    - gerrit-review-last-refspec
     - shell:
         !include-raw: common/scripts/deploy_heat_stack.sh
 
diff --git a/maintenance-ci/common/macroses/gerrit-review-last-refspec.yaml b/maintenance-ci/common/macroses/gerrit-review-last-refspec.yaml
index 8d19ed6..b3a2f23 100644
--- a/maintenance-ci/common/macroses/gerrit-review-last-refspec.yaml
+++ b/maintenance-ci/common/macroses/gerrit-review-last-refspec.yaml
@@ -1,4 +1,4 @@
-- builders:
+- builder:
     name: gerrit-review-last-refspec
     builders:
     - shell:
diff --git a/maintenance-ci/common/scripts/deploy_heat_stack.sh b/maintenance-ci/common/scripts/deploy_heat_stack.sh
index 3ad5146..cb75943 100755
--- a/maintenance-ci/common/scripts/deploy_heat_stack.sh
+++ b/maintenance-ci/common/scripts/deploy_heat_stack.sh
@@ -2,11 +2,6 @@
 
 set -ex
 
-if [ ! -z ${GERRIT_REVIEW} ] ; then
-refspec=$(curl "https://review.fuel-infra.org/changes/?q=${GERRIT_REVIEW}&o=CURRENT_REVISION" | grep '"ref":' | awk -F ": " '{print $2}' | tr -d '"')
-git fetch https://review.fuel-infra.org/tools/sustaining "${refspec}" && git cherry-pick -n FETCH_HEAD
-fi
-
 OPENSTACK_CLIENTS_VENV="${OPENSTACK_CLIENTS_VENV:-/home/jenkins/venv-openstack-clients}"
 
 if [[ ! -d "${OPENSTACK_CLIENTS_VENV}" ]] ; then
diff --git a/maintenance-ci/views/9.x.tempest.yaml b/maintenance-ci/views/9.x.tempest.yaml
index cf2f4c8..409e1de 100644
--- a/maintenance-ci/views/9.x.tempest.yaml
+++ b/maintenance-ci/views/9.x.tempest.yaml
@@ -4,7 +4,7 @@
     regex: '9.x.tempest.*'
 #    jobs:
 #      - 9.x.tempest
-#      - maintenance-tempest-reports-Testrail
+#      - maintenance-tempest-report
 #      - maintenance-tempest-runner
     columns:
         - status