Several minor fixes

Change-Id: I2b7acac31790db210524c55a58d083016d588d2b

diff --git a/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh b/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
index a5448c3af54c2597393f795a1494c8cfcde6434e..48f18246b4e651d8bcceec91caa59d0837776fe1 100644 (file)
--- a/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
+++ b/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
@@ -85,7 +85,9 @@ WantedBy=cloud-init.target
 EOF
 systemctl enable jenkins-swarm-agent
 
+shopt -s dotglob
 chown -R jenkins:jenkins /home/jenkins/
+shopt -u dotglob
 
 cp /etc/apt/sources.list.bkp /etc/apt/sources.list
 apt update

diff --git a/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh b/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
index e6f9aa7b56522ecfe61c4a5af6bbec61126ec20c..fe97b9bb5db614e12de18a274c09f3e19b54f50b 100644 (file)
--- a/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
+++ b/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
@@ -153,7 +153,10 @@ source /home/jenkins/qa-venv-9.x/bin/activate
 deactivate
 "
 echo "export DEVOPS_LOCK_FILE=/run/lock/devops_lock" >> /home/jenkins/qa-venv-9.x/bin/activate
+
+shopt -s dotglob
 chown -R jenkins:jenkins /home/jenkins/
+shopt -u dotglob
 
 cp /etc/apt/sources.list.bkp /etc/apt/sources.list
 apt update

diff --git a/maintenance-ci/mos/macroses/9x-systest-params.yaml b/maintenance-ci/mos/macroses/9x-systest-params.yaml
index e3a2764120afec65fca4173a02c2484cca3d288a..cfc41d42d4fbd89e4e9d52dcc548cfc620ce83b0 100644 (file)
--- a/maintenance-ci/mos/macroses/9x-systest-params.yaml
+++ b/maintenance-ci/mos/macroses/9x-systest-params.yaml
@@ -35,6 +35,10 @@
         name: FUEL_QA_COMMIT
         description: "fuel-qa commit"
         default: stable/mitaka
+    - string:
+        name: GERRIT_REVIEW
+        description: "gerrit review num"
+        default: ""
 
 
     # section for mos rpm repos

diff --git a/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh b/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh
index bcf4dd13945382077cd7ca36f59a5d93c0dc8ffc..6a7b1db7f48de8c2293a656896bd477be0a075b1 100644 (file)
--- a/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh
+++ b/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh
@@ -33,6 +33,11 @@ echo "======================================================"
 echo "======================================================"
 set -x
 
+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/openstack/fuel-qa "${refspec}" && git cherry-pick -n FETCH_HEAD
+fi
+
 source "${VENV_PATH}/bin/activate"
   pip install -U -r fuelweb_test/requirements.txt > logs/pip_install_output.log
   export PYTHONPATH="${WORKSPACE}"

diff --git a/maintenance-ci/views/9.x.tempest.yaml b/maintenance-ci/views/9.x.tempest.yaml
index 409e1de35e354a6d7f9b3ce81be0232e0e11c0d1..d25227219986d29bbe5915e2ca8c26016cbf7f04 100644 (file)
--- a/maintenance-ci/views/9.x.tempest.yaml
+++ b/maintenance-ci/views/9.x.tempest.yaml
@@ -1,11 +1,10 @@
 - view:
     type: list
     name: '9.x.tempest'
-    regex: '9.x.tempest.*'
-#    jobs:
-#      - 9.x.tempest
-#      - maintenance-tempest-report
-#      - maintenance-tempest-runner
+    regex: '*tempest*'
+    jobs:
+        - maintenance-tempest-report
+        - maintenance-tempest-runner
     columns:
         - status
         - weather