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 8f56d1c3d1a7db8a829206d7dcce6160282f4d9f..c2eb3f08da184b696999d6489cfff3bf970ed99f 100644 (file)
--- 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 8d19ed6d0b5769f6c986f438589cf1b37b22c29d..b3a2f2304e77418dcb4ceb51cf32da4fe4270297 100644 (file)
--- 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 3ad514688c57e1ab6cba3f51197fe88544a25dd7..cb7594385a760f5d2fa010fc4e341f48292d58de 100755 (executable)
--- 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 cf2f4c8cda7d6edfb6682b1a7d53e696ace17a52..409e1de35e354a6d7f9b3ce81be0232e0e11c0d1 100644 (file)
--- 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