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
This commit is contained in:
parent
3f55e10de6
commit
dfbe61bea1
|
@ -33,7 +33,7 @@
|
||||||
disabled: false
|
disabled: false
|
||||||
concurrent: false
|
concurrent: false
|
||||||
#In Jenkins v1.642.1 jobs triggered by zuul cannot be run on master
|
#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:
|
builders:
|
||||||
- shell: |
|
- shell: |
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
- job-template:
|
- job-template:
|
||||||
name: 'hook-{name}-rtfd'
|
name: 'hook-{name}-rtfd'
|
||||||
node: trusty-devstack-cz5608 || trusty-devstack-cz5680
|
node: trusty-devstack-cz5608 || xenial-devstack-cz5680
|
||||||
|
|
||||||
builders:
|
builders:
|
||||||
- shell: 'curl -X POST https://readthedocs.org/build/{name} >/dev/null'
|
- shell: 'curl -X POST https://readthedocs.org/build/{name} >/dev/null'
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
description: '{name} {pkg-service} {distro} gate job'
|
description: '{name} {pkg-service} {distro} gate job'
|
||||||
disabled: false
|
disabled: false
|
||||||
concurrent: true
|
concurrent: true
|
||||||
node: trusty-devstack-cz5608 || trusty-devstack-cz5680
|
node: trusty-devstack-cz5608 || xenial-devstack-cz5680
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
- bool:
|
- bool:
|
||||||
|
@ -51,7 +51,7 @@
|
||||||
description: '{name} {distro} heartbeat job'
|
description: '{name} {distro} heartbeat job'
|
||||||
disabled: false
|
disabled: false
|
||||||
concurrent: true
|
concurrent: true
|
||||||
node: trusty-devstack-cz5608 || trusty-devstack-cz5680
|
node: trusty-devstack-cz5608 || xenial-devstack-cz5680
|
||||||
|
|
||||||
triggers:
|
triggers:
|
||||||
- timed: "H */3 * * *"
|
- timed: "H */3 * * *"
|
||||||
|
@ -99,7 +99,7 @@
|
||||||
description: '{name} {distro} coverage job'
|
description: '{name} {distro} coverage job'
|
||||||
disabled: false
|
disabled: false
|
||||||
concurrent: true
|
concurrent: true
|
||||||
node: trusty-devstack-cz5608 || trusty-devstack-cz5680
|
node: trusty-devstack-cz5608 || xenial-devstack-cz5680
|
||||||
|
|
||||||
triggers:
|
triggers:
|
||||||
- timed: "H */3 * * *"
|
- timed: "H */3 * * *"
|
||||||
|
|
|
@ -16,8 +16,8 @@ labels:
|
||||||
min-ready: 6
|
min-ready: 6
|
||||||
providers:
|
providers:
|
||||||
- name: cilab-1
|
- name: cilab-1
|
||||||
- name: trusty-devstack-cz5680
|
- name: xenial-devstack-cz5680
|
||||||
image: trusty-devstack-cz5680
|
image: xenial-devstack-cz5680
|
||||||
min-ready: 6
|
min-ready: 6
|
||||||
providers:
|
providers:
|
||||||
- name: cilab-2
|
- name: cilab-2
|
||||||
|
|
|
@ -36,6 +36,10 @@ if [ -f /usr/bin/yum ]; then
|
||||||
sudo yum -y install wget
|
sudo yum -y install wget
|
||||||
fi
|
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://raw.github.com/pypa/pip/master/contrib/get-pip.py
|
||||||
wget https://git.openstack.org/cgit/openstack-infra/system-config/plain/install_puppet.sh
|
wget https://git.openstack.org/cgit/openstack-infra/system-config/plain/install_puppet.sh
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue