From dfbe61bea16a82dfd0f4a0d6d051e6364ad5d40e Mon Sep 17 00:00:00 2001
From: Victor Ryzhenkin <vryzhenkin@mirantis.com>
Date: Tue, 6 Jun 2017 20:45:43 +0400
Subject: [PATCH] Rewrite labels and add workaround for xenial

- Change trusty label to xenial in all jobs
- Install default python on xenial nodpool images

Change-Id: Ie09dc53847144c237b3e9440c1b15f22a5c10899
---
 murano-ci/jenkins/jobs/ci-infra.yaml       | 2 +-
 murano-ci/jenkins/jobs/hooks.yaml          | 4 ++--
 murano-ci/jenkins/jobs/murano_jobs.yaml    | 6 +++---
 murano-ci/nodepool/nodepool.yaml           | 4 ++--
 murano-ci/nodepool/scripts/prepare_node.sh | 4 ++++
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/murano-ci/jenkins/jobs/ci-infra.yaml b/murano-ci/jenkins/jobs/ci-infra.yaml
index 436d9513..3d7b164a 100755
--- a/murano-ci/jenkins/jobs/ci-infra.yaml
+++ b/murano-ci/jenkins/jobs/ci-infra.yaml
@@ -33,7 +33,7 @@
     disabled: false
     concurrent: false
     #In Jenkins v1.642.1 jobs triggered by zuul cannot be run on master
-    node: trusty-devstack-cz5608 || trusty-devstack-cz5680
+    node: trusty-devstack-cz5608 || xenial-devstack-cz5680
 
     builders:
       - shell: |
diff --git a/murano-ci/jenkins/jobs/hooks.yaml b/murano-ci/jenkins/jobs/hooks.yaml
index 93081510..48623245 100755
--- a/murano-ci/jenkins/jobs/hooks.yaml
+++ b/murano-ci/jenkins/jobs/hooks.yaml
@@ -1,6 +1,6 @@
 - job-template:
     name: 'hook-{name}-rtfd'
-    node: trusty-devstack-cz5608 || trusty-devstack-cz5680
+    node: trusty-devstack-cz5608 || xenial-devstack-cz5680
 
     builders:
-      - shell: 'curl -X POST https://readthedocs.org/build/{name} >/dev/null'
\ No newline at end of file
+      - shell: 'curl -X POST https://readthedocs.org/build/{name} >/dev/null'
diff --git a/murano-ci/jenkins/jobs/murano_jobs.yaml b/murano-ci/jenkins/jobs/murano_jobs.yaml
index e3b02a00..d3b15eb6 100755
--- a/murano-ci/jenkins/jobs/murano_jobs.yaml
+++ b/murano-ci/jenkins/jobs/murano_jobs.yaml
@@ -5,7 +5,7 @@
     description: '{name} {pkg-service} {distro} gate job'
     disabled: false
     concurrent: true
-    node: trusty-devstack-cz5608 || trusty-devstack-cz5680
+    node: trusty-devstack-cz5608 || xenial-devstack-cz5680
 
     parameters:
       - bool:
@@ -51,7 +51,7 @@
     description: '{name} {distro} heartbeat job'
     disabled: false
     concurrent: true
-    node: trusty-devstack-cz5608 || trusty-devstack-cz5680
+    node: trusty-devstack-cz5608 || xenial-devstack-cz5680
 
     triggers:
       - timed: "H */3 * * *"
@@ -99,7 +99,7 @@
     description: '{name} {distro} coverage job'
     disabled: false
     concurrent: true
-    node: trusty-devstack-cz5608 || trusty-devstack-cz5680
+    node: trusty-devstack-cz5608 || xenial-devstack-cz5680
 
     triggers:
       - timed: "H */3 * * *"
diff --git a/murano-ci/nodepool/nodepool.yaml b/murano-ci/nodepool/nodepool.yaml
index ce1b8210..032d0e8c 100755
--- a/murano-ci/nodepool/nodepool.yaml
+++ b/murano-ci/nodepool/nodepool.yaml
@@ -16,8 +16,8 @@ labels:
     min-ready: 6
     providers:
       - name: cilab-1
-  - name: trusty-devstack-cz5680
-    image: trusty-devstack-cz5680
+  - name: xenial-devstack-cz5680
+    image: xenial-devstack-cz5680
     min-ready: 6
     providers:
       - name: cilab-2
diff --git a/murano-ci/nodepool/scripts/prepare_node.sh b/murano-ci/nodepool/scripts/prepare_node.sh
index 6aabedd3..00533b02 100755
--- a/murano-ci/nodepool/scripts/prepare_node.sh
+++ b/murano-ci/nodepool/scripts/prepare_node.sh
@@ -36,6 +36,10 @@ if [ -f /usr/bin/yum ]; then
     sudo yum -y install wget
 fi
 
+# Xenial by default have only python3 command
+sudo apt-get update
+sudo apt-get install python -y
+
 #wget https://raw.github.com/pypa/pip/master/contrib/get-pip.py
 wget https://git.openstack.org/cgit/openstack-infra/system-config/plain/install_puppet.sh