From b9766945d21d1ceae38579511cdb8ac091590c96 Mon Sep 17 00:00:00 2001
From: Vladimir Khlyunev <vkhlyunev@mirantis.com>
Date: Mon, 1 Apr 2019 13:09:28 +0400
Subject: [PATCH] Several minor fixes

Change-Id: I2b7acac31790db210524c55a58d083016d588d2b
---
 .../common/scripts/build_base_swarm_slave_image.sh       | 2 ++
 .../common/scripts/build_mos_swarm_slave_image.sh        | 3 +++
 maintenance-ci/mos/macroses/9x-systest-params.yaml       | 4 ++++
 maintenance-ci/mos/scripts/fuel_qa_launch_test.sh        | 5 +++++
 maintenance-ci/views/9.x.tempest.yaml                    | 9 ++++-----
 5 files changed, 18 insertions(+), 5 deletions(-)

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 a5448c3..48f1824 100644
--- 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 e6f9aa7..fe97b9b 100644
--- 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 e3a2764..cfc41d4 100644
--- 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 bcf4dd1..6a7b1db 100644
--- 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 409e1de..d252272 100644
--- 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
-- 
2.45.2