From 6ec8d2cb7e1deb9d5562d7d3869498a6f12ac475 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 24 Apr 2018 14:01:55 -0400 Subject: [PATCH] Stop using slave_scripts/install-distro-packages.sh Migrate the legacy job to start using our bindep role from zuul-jobs. This will allow openstack-infra to delete slave_scripts/install-distro-packages.sh in the future. Remove enabling of epel on ubuntu periodic kolla jobs, as it isn't needed. Change-Id: Iecb7729214401e058f75620904adbc3a2a0333f8 Signed-off-by: Paul Belanger --- playbooks/legacy/ansible-lint/run.yaml | 8 +++---- .../astara-appliance-buildimage/run.yaml | 8 +++---- .../legacy/beaker-localhost-rake/run.yaml | 8 +++---- .../legacy/beaker-nodepool-rake/run.yaml | 8 +++---- playbooks/legacy/dox-buildimages/run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../legacy/fuel-library-puppet-lint/run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../legacy/fuel-octane-puppet-lint/run.yaml | 8 +++---- .../gearman-plugin-hpi-artifact/run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../legacy/groups-release-branch/run.yaml | 8 +++---- .../legacy/groups-release-master/run.yaml | 8 +++---- playbooks/legacy/groups-unittests/run.yaml | 8 +++---- .../legacy/hacking-integration-nova/run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../labs-ig-cluster-kvm-ubuntu/run.yaml | 8 +++---- .../labs-ig-cluster-vbox-ubuntu/run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../laravel-openstackid-unittests/run.yaml | 8 +++---- .../legacy/manila-buildimage-docker/run.yaml | 8 +++---- .../legacy/manila-buildimage-generic/run.yaml | 8 +++---- .../manila-publishimage-generic/run.yaml | 8 +++---- .../legacy/manila-test-image-build/run.yaml | 8 +++---- .../monasca-api-localrepo-upload/run.yaml | 8 +++---- .../legacy/monasca-api-maven-build/run.yaml | 8 +++---- .../monasca-common-localrepo-upload/run.yaml | 8 +++---- .../monasca-common-maven-build/run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../monasca-persister-maven-build/run.yaml | 8 +++---- .../monasca-thresh-localrepo-upload/run.yaml | 8 +++---- .../monasca-thresh-maven-build/run.yaml | 8 +++---- playbooks/legacy/omni-tests/run.yaml | 8 +++---- .../legacy/openstack-planet-unittest/run.yaml | 8 +++---- .../run.yaml | 22 +++++++------------ .../run.yaml | 22 +++++++------------ .../run.yaml | 22 +++++++------------ .../run.yaml | 20 ++++++----------- .../run.yaml | 22 +++++++------------ .../run.yaml | 21 +++++++----------- .../run.yaml | 17 +++----------- .../run.yaml | 17 +++----------- .../run.yaml | 17 +++----------- .../run.yaml | 17 +++----------- .../run.yaml | 17 +++----------- .../run.yaml | 17 +++----------- .../run.yaml | 8 +++---- .../post-sahara-extra-artifacts/run.yaml | 8 +++---- .../puppet-beaker-rspec-centos-7/run.yaml | 8 +++---- .../run.yaml | 8 +++---- playbooks/legacy/puppet-beaker-rspec/run.yaml | 8 +++---- playbooks/legacy/puppet-lint/run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../legacy/puppet-syntax-3-centos-7/run.yaml | 8 +++---- playbooks/legacy/puppet-syntax-3/run.yaml | 8 +++---- .../legacy/puppet-syntax-4-centos-7/run.yaml | 8 +++---- .../legacy/puppet-unit-3.6-centos-7/run.yaml | 8 +++---- .../legacy/puppet-unit-3.8-centos-7/run.yaml | 8 +++---- .../legacy/puppet-unit-4.8-centos-7/run.yaml | 8 +++---- .../puppet-unit-latest-centos-7/run.yaml | 8 +++---- .../legacy/sahara-extra-artifacts/run.yaml | 8 +++---- playbooks/legacy/sandbox-tag/run.yaml | 8 +++---- .../run.yaml | 8 +++---- .../legacy/storyboard-js-integration/run.yaml | 8 +++---- .../system-config-puppet-syntax-3/run.yaml | 8 +++---- .../zmq-event-publisher-hpi-artifact/run.yaml | 8 +++---- .../run.yaml | 8 +++---- 82 files changed, 275 insertions(+), 516 deletions(-) diff --git a/playbooks/legacy/ansible-lint/run.yaml b/playbooks/legacy/ansible-lint/run.yaml index db8aece8..1af3ece1 100644 --- a/playbooks/legacy/ansible-lint/run.yaml +++ b/playbooks/legacy/ansible-lint/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-ansible-lint from old job gate-{name}-ansible-lint + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/astara-appliance-buildimage/run.yaml b/playbooks/legacy/astara-appliance-buildimage/run.yaml index 3d9cffb7..9c29a758 100644 --- a/playbooks/legacy/astara-appliance-buildimage/run.yaml +++ b/playbooks/legacy/astara-appliance-buildimage/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-astara-appliance-buildimage from old job astara-appliance-buildimage-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | sudo apt-get update diff --git a/playbooks/legacy/beaker-localhost-rake/run.yaml b/playbooks/legacy/beaker-localhost-rake/run.yaml index f93882d0..531d1215 100644 --- a/playbooks/legacy/beaker-localhost-rake/run.yaml +++ b/playbooks/legacy/beaker-localhost-rake/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-beaker-localhost-rake from old job gate-beaker-localhost-rake + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/beaker-nodepool-rake/run.yaml b/playbooks/legacy/beaker-nodepool-rake/run.yaml index acbd43bb..e6ba6f29 100644 --- a/playbooks/legacy/beaker-nodepool-rake/run.yaml +++ b/playbooks/legacy/beaker-nodepool-rake/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-beaker-nodepool-rake from old job gate-beaker-nodepool-rake + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/dox-buildimages/run.yaml b/playbooks/legacy/dox-buildimages/run.yaml index 698bc557..501169ff 100644 --- a/playbooks/legacy/dox-buildimages/run.yaml +++ b/playbooks/legacy/dox-buildimages/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-dox-buildimages from old job gate-dox-buildimages-nv + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | if [ -x tools/test-setup.sh ] ; then diff --git a/playbooks/legacy/fuel-astute-puppet-unit-3.8-centos-7/run.yaml b/playbooks/legacy/fuel-astute-puppet-unit-3.8-centos-7/run.yaml index 5f90ccc7..02c7ad94 100644 --- a/playbooks/legacy/fuel-astute-puppet-unit-3.8-centos-7/run.yaml +++ b/playbooks/legacy/fuel-astute-puppet-unit-3.8-centos-7/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-fuel-astute-puppet-unit-3.8-centos-7 from old job gate-fuel-astute-puppet-unit-3.8-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -37,11 +40,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/fuel-library-puppet-lint/run.yaml b/playbooks/legacy/fuel-library-puppet-lint/run.yaml index d1495835..0e37e262 100644 --- a/playbooks/legacy/fuel-library-puppet-lint/run.yaml +++ b/playbooks/legacy/fuel-library-puppet-lint/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-fuel-library-puppet-lint from old job gate-fuel-library-puppet-lint + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/fuel-library-puppet-unit-3.8-centos-7/run.yaml b/playbooks/legacy/fuel-library-puppet-unit-3.8-centos-7/run.yaml index 75bd1b93..0ab84861 100644 --- a/playbooks/legacy/fuel-library-puppet-unit-3.8-centos-7/run.yaml +++ b/playbooks/legacy/fuel-library-puppet-unit-3.8-centos-7/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-fuel-library-puppet-unit-3.8-centos-7 from old job gate-fuel-library-puppet-unit-3.8-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -37,11 +40,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/fuel-library-puppet-unit-4.5-centos-7/run.yaml b/playbooks/legacy/fuel-library-puppet-unit-4.5-centos-7/run.yaml index 247dac0d..a7a6219e 100644 --- a/playbooks/legacy/fuel-library-puppet-unit-4.5-centos-7/run.yaml +++ b/playbooks/legacy/fuel-library-puppet-unit-4.5-centos-7/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-fuel-library-puppet-unit-4.5-centos-7 from old job gate-fuel-library-puppet-unit-4.5-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -37,11 +40,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/fuel-nailgun-agent-puppet-unit-3.8-centos-7/run.yaml b/playbooks/legacy/fuel-nailgun-agent-puppet-unit-3.8-centos-7/run.yaml index 370f8c6d..183db9d2 100644 --- a/playbooks/legacy/fuel-nailgun-agent-puppet-unit-3.8-centos-7/run.yaml +++ b/playbooks/legacy/fuel-nailgun-agent-puppet-unit-3.8-centos-7/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-fuel-nailgun-agent-puppet-unit-3.8-centos-7 from old job gate-fuel-nailgun-agent-puppet-unit-3.8-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -37,11 +40,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/fuel-octane-puppet-lint/run.yaml b/playbooks/legacy/fuel-octane-puppet-lint/run.yaml index 9bd39f50..947d6f78 100644 --- a/playbooks/legacy/fuel-octane-puppet-lint/run.yaml +++ b/playbooks/legacy/fuel-octane-puppet-lint/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-fuel-octane-puppet-lint from old job gate-fuel-octane-puppet-lint + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/gearman-plugin-hpi-artifact/run.yaml b/playbooks/legacy/gearman-plugin-hpi-artifact/run.yaml index 3c4bb180..23ad0802 100644 --- a/playbooks/legacy/gearman-plugin-hpi-artifact/run.yaml +++ b/playbooks/legacy/gearman-plugin-hpi-artifact/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-gearman-plugin-hpi-artifact from old job gearman-plugin-hpi-artifact + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/gearman-plugin-maven-build-ubuntu-trusty/run.yaml b/playbooks/legacy/gearman-plugin-maven-build-ubuntu-trusty/run.yaml index f02af6c3..bcbfa662 100644 --- a/playbooks/legacy/gearman-plugin-maven-build-ubuntu-trusty/run.yaml +++ b/playbooks/legacy/gearman-plugin-maven-build-ubuntu-trusty/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-gearman-plugin-maven-build-ubuntu-trusty from old job gate-gearman-plugin-maven-build-ubuntu-trusty + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -37,11 +40,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/groups-release-branch/run.yaml b/playbooks/legacy/groups-release-branch/run.yaml index b918a68f..efe2b0c4 100644 --- a/playbooks/legacy/groups-release-branch/run.yaml +++ b/playbooks/legacy/groups-release-branch/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-groups-release-branch from old job groups-release-branch + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/groups-release-master/run.yaml b/playbooks/legacy/groups-release-master/run.yaml index 1c4026f8..9e53cf93 100644 --- a/playbooks/legacy/groups-release-master/run.yaml +++ b/playbooks/legacy/groups-release-master/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-groups-release-master from old job groups-release-master + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/groups-unittests/run.yaml b/playbooks/legacy/groups-unittests/run.yaml index 690198a6..15acae12 100644 --- a/playbooks/legacy/groups-unittests/run.yaml +++ b/playbooks/legacy/groups-unittests/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-groups-unittests from old job gate-groups-unittests + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/hacking-integration-nova/run.yaml b/playbooks/legacy/hacking-integration-nova/run.yaml index 9a9365c2..96f81a87 100644 --- a/playbooks/legacy/hacking-integration-nova/run.yaml +++ b/playbooks/legacy/hacking-integration-nova/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-hacking-integration-nova from old job gate-hacking-integration-nova + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -7,11 +10,6 @@ path: '{{ ansible_user_dir }}/workspace' state: directory - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/js-generator-openstack-nodejs6-npm-docs/run.yaml b/playbooks/legacy/js-generator-openstack-nodejs6-npm-docs/run.yaml index 24291201..09a78fd0 100644 --- a/playbooks/legacy/js-generator-openstack-nodejs6-npm-docs/run.yaml +++ b/playbooks/legacy/js-generator-openstack-nodejs6-npm-docs/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-js-generator-openstack-nodejs6-npm-docs from old job js-generator-openstack-nodejs6-npm-docs + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -37,11 +40,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/js-openstack-lib-dsvm-nodejs4-npm-run-functional-test/run.yaml b/playbooks/legacy/js-openstack-lib-dsvm-nodejs4-npm-run-functional-test/run.yaml index eb904324..72410171 100644 --- a/playbooks/legacy/js-openstack-lib-dsvm-nodejs4-npm-run-functional-test/run.yaml +++ b/playbooks/legacy/js-openstack-lib-dsvm-nodejs4-npm-run-functional-test/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-js-openstack-lib-dsvm-nodejs4-npm-run-functional-test from old job js-openstack-lib-dsvm-nodejs4-npm-run-functional-test + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -37,11 +40,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/js-openstack-lib-dsvm-nodejs6-npm-run-functional-test/run.yaml b/playbooks/legacy/js-openstack-lib-dsvm-nodejs6-npm-run-functional-test/run.yaml index 39b4e9f4..5b235785 100644 --- a/playbooks/legacy/js-openstack-lib-dsvm-nodejs6-npm-run-functional-test/run.yaml +++ b/playbooks/legacy/js-openstack-lib-dsvm-nodejs6-npm-run-functional-test/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-js-openstack-lib-dsvm-nodejs6-npm-run-functional-test from old job js-openstack-lib-dsvm-nodejs6-npm-run-functional-test + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -37,11 +40,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/js-openstack-lib-nodejs6-npm-sdk-docs/run.yaml b/playbooks/legacy/js-openstack-lib-nodejs6-npm-sdk-docs/run.yaml index d5465aa7..2ac1bdfe 100644 --- a/playbooks/legacy/js-openstack-lib-nodejs6-npm-sdk-docs/run.yaml +++ b/playbooks/legacy/js-openstack-lib-nodejs6-npm-sdk-docs/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-js-openstack-lib-nodejs6-npm-sdk-docs from old job js-openstack-lib-nodejs6-npm-sdk-docs + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -37,11 +40,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/labs-ig-cluster-kvm-ubuntu/run.yaml b/playbooks/legacy/labs-ig-cluster-kvm-ubuntu/run.yaml index 7e1a1d16..cada7e7c 100644 --- a/playbooks/legacy/labs-ig-cluster-kvm-ubuntu/run.yaml +++ b/playbooks/legacy/labs-ig-cluster-kvm-ubuntu/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-labs-ig-cluster-kvm-ubuntu from old job gate-labs-ig-cluster-kvm-ubuntu-nv + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: ./tools/cluster kvm ubuntu chdir: '{{ ansible_user_dir }}/workspace' diff --git a/playbooks/legacy/labs-ig-cluster-vbox-ubuntu/run.yaml b/playbooks/legacy/labs-ig-cluster-vbox-ubuntu/run.yaml index a4ab4767..92011de6 100644 --- a/playbooks/legacy/labs-ig-cluster-vbox-ubuntu/run.yaml +++ b/playbooks/legacy/labs-ig-cluster-vbox-ubuntu/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-labs-ig-cluster-vbox-ubuntu from old job gate-labs-ig-cluster-vbox-ubuntu-nv + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: ./tools/cluster vbox ubuntu chdir: '{{ ansible_user_dir }}/workspace' diff --git a/playbooks/legacy/laravel-openstackid-release-branch/run.yaml b/playbooks/legacy/laravel-openstackid-release-branch/run.yaml index 146e193e..a438e188 100644 --- a/playbooks/legacy/laravel-openstackid-release-branch/run.yaml +++ b/playbooks/legacy/laravel-openstackid-release-branch/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-laravel-openstackid-release-branch from old job laravel-openstackid-release-branch + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/laravel-openstackid-release-master/run.yaml b/playbooks/legacy/laravel-openstackid-release-master/run.yaml index 80d97ef1..1b0548c8 100644 --- a/playbooks/legacy/laravel-openstackid-release-master/run.yaml +++ b/playbooks/legacy/laravel-openstackid-release-master/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-laravel-openstackid-release-master from old job laravel-openstackid-release-master + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/laravel-openstackid-unittests/run.yaml b/playbooks/legacy/laravel-openstackid-unittests/run.yaml index 34aa6f78..b8d21f3e 100644 --- a/playbooks/legacy/laravel-openstackid-unittests/run.yaml +++ b/playbooks/legacy/laravel-openstackid-unittests/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-laravel-openstackid-unittests from old job gate-laravel-openstackid-unittests + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/manila-buildimage-docker/run.yaml b/playbooks/legacy/manila-buildimage-docker/run.yaml index 966c4c97..b57b3833 100644 --- a/playbooks/legacy/manila-buildimage-docker/run.yaml +++ b/playbooks/legacy/manila-buildimage-docker/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-manila-buildimage-docker from old job gate-manila-buildimage-docker-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/manila-buildimage-generic/run.yaml b/playbooks/legacy/manila-buildimage-generic/run.yaml index 00828cd3..054b217a 100644 --- a/playbooks/legacy/manila-buildimage-generic/run.yaml +++ b/playbooks/legacy/manila-buildimage-generic/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-manila-buildimage-generic from old job gate-manila-buildimage-generic-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/manila-publishimage-generic/run.yaml b/playbooks/legacy/manila-publishimage-generic/run.yaml index e060c0a5..93899475 100644 --- a/playbooks/legacy/manila-publishimage-generic/run.yaml +++ b/playbooks/legacy/manila-publishimage-generic/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-manila-publishimage-generic from old job gate-manila-publishimage-generic-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/manila-test-image-build/run.yaml b/playbooks/legacy/manila-test-image-build/run.yaml index 58886926..80cdeb00 100644 --- a/playbooks/legacy/manila-test-image-build/run.yaml +++ b/playbooks/legacy/manila-test-image-build/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-manila-test-image-build from old job gate-manila-test-image-build + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/monasca-api-localrepo-upload/run.yaml b/playbooks/legacy/monasca-api-localrepo-upload/run.yaml index ec075972..88fe6909 100644 --- a/playbooks/legacy/monasca-api-localrepo-upload/run.yaml +++ b/playbooks/legacy/monasca-api-localrepo-upload/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-monasca-api-localrepo-upload from old job monasca-api-localrepo-upload-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/monasca-api-maven-build/run.yaml b/playbooks/legacy/monasca-api-maven-build/run.yaml index 0ea2b0bf..541888aa 100644 --- a/playbooks/legacy/monasca-api-maven-build/run.yaml +++ b/playbooks/legacy/monasca-api-maven-build/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-monasca-api-maven-build from old job gate-monasca-api-maven-build-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/monasca-common-localrepo-upload/run.yaml b/playbooks/legacy/monasca-common-localrepo-upload/run.yaml index b1c5d692..34f1cb9b 100644 --- a/playbooks/legacy/monasca-common-localrepo-upload/run.yaml +++ b/playbooks/legacy/monasca-common-localrepo-upload/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-monasca-common-localrepo-upload from old job monasca-common-localrepo-upload-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/monasca-common-maven-build/run.yaml b/playbooks/legacy/monasca-common-maven-build/run.yaml index e092d819..24f4074a 100644 --- a/playbooks/legacy/monasca-common-maven-build/run.yaml +++ b/playbooks/legacy/monasca-common-maven-build/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-monasca-common-maven-build from old job gate-monasca-common-maven-build-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/monasca-persister-localrepo-upload/run.yaml b/playbooks/legacy/monasca-persister-localrepo-upload/run.yaml index d23842af..41c2649b 100644 --- a/playbooks/legacy/monasca-persister-localrepo-upload/run.yaml +++ b/playbooks/legacy/monasca-persister-localrepo-upload/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-monasca-persister-localrepo-upload from old job monasca-persister-localrepo-upload-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/monasca-persister-maven-build/run.yaml b/playbooks/legacy/monasca-persister-maven-build/run.yaml index 0d30b0b8..61012c26 100644 --- a/playbooks/legacy/monasca-persister-maven-build/run.yaml +++ b/playbooks/legacy/monasca-persister-maven-build/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-monasca-persister-maven-build from old job gate-monasca-persister-maven-build-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/monasca-thresh-localrepo-upload/run.yaml b/playbooks/legacy/monasca-thresh-localrepo-upload/run.yaml index dc6ebc2b..4b9cb8d3 100644 --- a/playbooks/legacy/monasca-thresh-localrepo-upload/run.yaml +++ b/playbooks/legacy/monasca-thresh-localrepo-upload/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-monasca-thresh-localrepo-upload from old job monasca-thresh-localrepo-upload-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/monasca-thresh-maven-build/run.yaml b/playbooks/legacy/monasca-thresh-maven-build/run.yaml index 9d9547cd..c4f828f8 100644 --- a/playbooks/legacy/monasca-thresh-maven-build/run.yaml +++ b/playbooks/legacy/monasca-thresh-maven-build/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-monasca-thresh-maven-build from old job gate-monasca-thresh-maven-build-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/omni-tests/run.yaml b/playbooks/legacy/omni-tests/run.yaml index 752e37f4..2ee44bda 100644 --- a/playbooks/legacy/omni-tests/run.yaml +++ b/playbooks/legacy/omni-tests/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-omni-tests from old job gate-omni-tests + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/openstack-planet-unittest/run.yaml b/playbooks/legacy/openstack-planet-unittest/run.yaml index 758e5151..82db0670 100644 --- a/playbooks/legacy/openstack-planet-unittest/run.yaml +++ b/playbooks/legacy/openstack-planet-unittest/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-openstack-planet-unittest from old job gate-openstack-planet-unittest + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-2-ceph/run.yaml b/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-2-ceph/run.yaml index 50bf3172..8d863e0b 100644 --- a/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-2-ceph/run.yaml +++ b/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-2-ceph/run.yaml @@ -1,6 +1,14 @@ - hosts: all name: Autoconverted job legacy-periodic-kolla-kubernetes-deploy-centos-binary-2-ceph from old job periodic-kolla-kubernetes-deploy-centos-binary-2-ceph + roles: + - bindep + + pre_tasks: + - shell: + cmd: sudo yum-config-manager --enable epel + executable: /bin/bash + tasks: - name: Ensure legacy workspace directory @@ -43,20 +51,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - sudo yum-config-manager --enable epel || true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-2-iscsi/run.yaml b/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-2-iscsi/run.yaml index 41a34c9d..ce504060 100644 --- a/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-2-iscsi/run.yaml +++ b/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-2-iscsi/run.yaml @@ -1,6 +1,14 @@ - hosts: all name: Autoconverted job legacy-periodic-kolla-kubernetes-deploy-centos-binary-2-iscsi from old job periodic-kolla-kubernetes-deploy-centos-binary-2-iscsi + roles: + - bindep + + pre_tasks: + - shell: + cmd: sudo yum-config-manager --enable epel + executable: /bin/bash + tasks: - name: Ensure legacy workspace directory @@ -43,20 +51,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - sudo yum-config-manager --enable epel || true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-3-ceph/run.yaml b/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-3-ceph/run.yaml index c148b6be..5f7caf76 100644 --- a/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-3-ceph/run.yaml +++ b/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-3-ceph/run.yaml @@ -1,6 +1,14 @@ - hosts: all name: Autoconverted job legacy-periodic-kolla-kubernetes-deploy-centos-binary-3-ceph from old job periodic-kolla-kubernetes-deploy-centos-binary-3-ceph + roles: + - bindep + + pre_tasks: + - shell: + cmd: sudo yum-config-manager --enable epel + executable: /bin/bash + tasks: - name: Ensure legacy workspace directory @@ -43,20 +51,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - sudo yum-config-manager --enable epel || true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-3-iscsi/run.yaml b/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-3-iscsi/run.yaml index 92532b55..252e0bd8 100644 --- a/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-3-iscsi/run.yaml +++ b/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-3-iscsi/run.yaml @@ -1,6 +1,13 @@ - hosts: all name: Autoconverted job legacy-periodic-kolla-kubernetes-deploy-centos-binary-3-iscsi from old job periodic-kolla-kubernetes-deploy-centos-binary-3-iscsi + roles: + - bindep + + pre_tasks: + - shell: + cmd: sudo yum-config-manager --enable epel + executable: /bin/bash tasks: - name: Ensure legacy workspace directory @@ -43,19 +50,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - sudo yum-config-manager --enable epel || true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - shell: cmd: | diff --git a/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-4-ceph/run.yaml b/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-4-ceph/run.yaml index 7fddf645..71acd527 100644 --- a/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-4-ceph/run.yaml +++ b/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-4-ceph/run.yaml @@ -1,6 +1,14 @@ - hosts: all name: Autoconverted job legacy-periodic-kolla-kubernetes-deploy-centos-binary-4-ceph from old job periodic-kolla-kubernetes-deploy-centos-binary-4-ceph + roles: + - bindep + + pre_tasks: + - shell: + cmd: sudo yum-config-manager --enable epel + executable: /bin/bash + tasks: - name: Ensure legacy workspace directory @@ -43,20 +51,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - sudo yum-config-manager --enable epel || true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-4-iscsi/run.yaml b/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-4-iscsi/run.yaml index ab4a5097..574dba35 100644 --- a/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-4-iscsi/run.yaml +++ b/playbooks/legacy/periodic-kolla-kubernetes-deploy-centos-binary-4-iscsi/run.yaml @@ -1,6 +1,14 @@ - hosts: all name: Autoconverted job legacy-periodic-kolla-kubernetes-deploy-centos-binary-4-iscsi from old job periodic-kolla-kubernetes-deploy-centos-binary-4-iscsi + roles: + - bindep + + pre_tasks: + - shell: + cmd: sudo yum-config-manager --enable epel + executable: /bin/bash + tasks: - name: Ensure legacy workspace directory @@ -43,19 +51,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - sudo yum-config-manager --enable epel || true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - shell: cmd: | diff --git a/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-2-ceph/run.yaml b/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-2-ceph/run.yaml index 4ea7feab..138cccb4 100644 --- a/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-2-ceph/run.yaml +++ b/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-2-ceph/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-periodic-kolla-kubernetes-deploy-ubuntu-binary-2-ceph from old job periodic-kolla-kubernetes-deploy-ubuntu-binary-2-ceph + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -43,20 +46,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - sudo yum-config-manager --enable epel || true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-2-iscsi/run.yaml b/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-2-iscsi/run.yaml index 0300a74c..36dd1f00 100644 --- a/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-2-iscsi/run.yaml +++ b/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-2-iscsi/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-periodic-kolla-kubernetes-deploy-ubuntu-binary-2-iscsi from old job periodic-kolla-kubernetes-deploy-ubuntu-binary-2-iscsi + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -43,20 +46,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - sudo yum-config-manager --enable epel || true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-3-ceph/run.yaml b/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-3-ceph/run.yaml index 3c33b0c6..88da9578 100644 --- a/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-3-ceph/run.yaml +++ b/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-3-ceph/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-periodic-kolla-kubernetes-deploy-ubuntu-binary-3-ceph from old job periodic-kolla-kubernetes-deploy-ubuntu-binary-3-ceph + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -43,20 +46,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - sudo yum-config-manager --enable epel || true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-3-iscsi/run.yaml b/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-3-iscsi/run.yaml index 9b68d514..fcfb519e 100644 --- a/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-3-iscsi/run.yaml +++ b/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-3-iscsi/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-periodic-kolla-kubernetes-deploy-ubuntu-binary-3-iscsi from old job periodic-kolla-kubernetes-deploy-ubuntu-binary-3-iscsi + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -43,20 +46,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - sudo yum-config-manager --enable epel || true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-4-ceph/run.yaml b/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-4-ceph/run.yaml index 71d4c0fd..e46166ce 100644 --- a/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-4-ceph/run.yaml +++ b/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-4-ceph/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-periodic-kolla-kubernetes-deploy-ubuntu-binary-4-ceph from old job periodic-kolla-kubernetes-deploy-ubuntu-binary-4-ceph + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -43,20 +46,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - sudo yum-config-manager --enable epel || true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-4-iscsi/run.yaml b/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-4-iscsi/run.yaml index 868ea212..e7a42c0b 100644 --- a/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-4-iscsi/run.yaml +++ b/playbooks/legacy/periodic-kolla-kubernetes-deploy-ubuntu-binary-4-iscsi/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-periodic-kolla-kubernetes-deploy-ubuntu-binary-4-iscsi from old job periodic-kolla-kubernetes-deploy-ubuntu-binary-4-iscsi + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -43,20 +46,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - sudo yum-config-manager --enable epel || true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/periodic-package-stackviz-element/run.yaml b/playbooks/legacy/periodic-package-stackviz-element/run.yaml index b9922990..12b0b3dc 100644 --- a/playbooks/legacy/periodic-package-stackviz-element/run.yaml +++ b/playbooks/legacy/periodic-package-stackviz-element/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-periodic-package-stackviz-element from old job periodic-package-stackviz-element + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -30,11 +33,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/post-sahara-extra-artifacts/run.yaml b/playbooks/legacy/post-sahara-extra-artifacts/run.yaml index 1a9cb968..1cc5ff39 100644 --- a/playbooks/legacy/post-sahara-extra-artifacts/run.yaml +++ b/playbooks/legacy/post-sahara-extra-artifacts/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-post-sahara-extra-artifacts from old job post-sahara-extra-artifacts + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-beaker-rspec-centos-7/run.yaml b/playbooks/legacy/puppet-beaker-rspec-centos-7/run.yaml index 09edaad6..4491f29f 100644 --- a/playbooks/legacy/puppet-beaker-rspec-centos-7/run.yaml +++ b/playbooks/legacy/puppet-beaker-rspec-centos-7/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-puppet-beaker-rspec-centos-7 from old job gate-{name}-puppet-beaker-rspec-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -67,11 +70,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-beaker-rspec-ubuntu-trusty/run.yaml b/playbooks/legacy/puppet-beaker-rspec-ubuntu-trusty/run.yaml index 7b006818..b006a282 100644 --- a/playbooks/legacy/puppet-beaker-rspec-ubuntu-trusty/run.yaml +++ b/playbooks/legacy/puppet-beaker-rspec-ubuntu-trusty/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-puppet-beaker-rspec-ubuntu-trusty from old job gate-{name}-puppet-beaker-rspec-ubuntu-trusty-nv + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -67,11 +70,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-beaker-rspec/run.yaml b/playbooks/legacy/puppet-beaker-rspec/run.yaml index 051f9ed4..048e0db3 100644 --- a/playbooks/legacy/puppet-beaker-rspec/run.yaml +++ b/playbooks/legacy/puppet-beaker-rspec/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-puppet-beaker-rspec from old job gate-{name}-puppet-beaker-rspec-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -67,11 +70,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-lint/run.yaml b/playbooks/legacy/puppet-lint/run.yaml index 54863ead..5f073803 100644 --- a/playbooks/legacy/puppet-lint/run.yaml +++ b/playbooks/legacy/puppet-lint/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-puppet-lint from old job gate-{name}-puppet-lint + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-midonet-puppet-unit-3.6-centos-7/run.yaml b/playbooks/legacy/puppet-midonet-puppet-unit-3.6-centos-7/run.yaml index d2defb2d..e27e64c6 100644 --- a/playbooks/legacy/puppet-midonet-puppet-unit-3.6-centos-7/run.yaml +++ b/playbooks/legacy/puppet-midonet-puppet-unit-3.6-centos-7/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-puppet-midonet-puppet-unit-3.6-centos-7 from old job gate-puppet-midonet-puppet-unit-3.6-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -37,11 +40,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-midonet-puppet-unit-3.8-centos-7/run.yaml b/playbooks/legacy/puppet-midonet-puppet-unit-3.8-centos-7/run.yaml index 64099de1..76486d1f 100644 --- a/playbooks/legacy/puppet-midonet-puppet-unit-3.8-centos-7/run.yaml +++ b/playbooks/legacy/puppet-midonet-puppet-unit-3.8-centos-7/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-puppet-midonet-puppet-unit-3.8-centos-7 from old job gate-puppet-midonet-puppet-unit-3.8-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -37,11 +40,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-midonet-puppet-unit-4.5-centos-7/run.yaml b/playbooks/legacy/puppet-midonet-puppet-unit-4.5-centos-7/run.yaml index 674dc7b2..6950e7f2 100644 --- a/playbooks/legacy/puppet-midonet-puppet-unit-4.5-centos-7/run.yaml +++ b/playbooks/legacy/puppet-midonet-puppet-unit-4.5-centos-7/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-puppet-midonet-puppet-unit-4.5-centos-7 from old job gate-puppet-midonet-puppet-unit-4.5-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -37,11 +40,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-midonet-puppet-unit-latest-centos-7/run.yaml b/playbooks/legacy/puppet-midonet-puppet-unit-latest-centos-7/run.yaml index 1425a128..30ec3f60 100644 --- a/playbooks/legacy/puppet-midonet-puppet-unit-latest-centos-7/run.yaml +++ b/playbooks/legacy/puppet-midonet-puppet-unit-latest-centos-7/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-puppet-midonet-puppet-unit-latest-centos-7 from old job gate-puppet-midonet-puppet-unit-latest-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -37,11 +40,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-openstack-infra-spec-helper-unit-centos-7/run.yaml b/playbooks/legacy/puppet-openstack-infra-spec-helper-unit-centos-7/run.yaml index c88e7dcf..9d9fb3e6 100644 --- a/playbooks/legacy/puppet-openstack-infra-spec-helper-unit-centos-7/run.yaml +++ b/playbooks/legacy/puppet-openstack-infra-spec-helper-unit-centos-7/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-puppet-openstack-infra-spec-helper-unit-centos-7 from old job gate-puppet-openstack-infra-spec-helper-unit-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -16,11 +19,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-openstack-infra-spec-helper-unit-ubuntu-trusty/run.yaml b/playbooks/legacy/puppet-openstack-infra-spec-helper-unit-ubuntu-trusty/run.yaml index e9f4a7a9..c35afc71 100644 --- a/playbooks/legacy/puppet-openstack-infra-spec-helper-unit-ubuntu-trusty/run.yaml +++ b/playbooks/legacy/puppet-openstack-infra-spec-helper-unit-ubuntu-trusty/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-puppet-openstack-infra-spec-helper-unit-ubuntu-trusty from old job gate-puppet-openstack-infra-spec-helper-unit-ubuntu-trusty + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -16,11 +19,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-openstack-infra-spec-helper-unit/run.yaml b/playbooks/legacy/puppet-openstack-infra-spec-helper-unit/run.yaml index 81f20fe4..3f29964b 100644 --- a/playbooks/legacy/puppet-openstack-infra-spec-helper-unit/run.yaml +++ b/playbooks/legacy/puppet-openstack-infra-spec-helper-unit/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-puppet-openstack-infra-spec-helper-unit from old job gate-puppet-openstack-infra-spec-helper-unit-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -16,11 +19,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-centos-7/run.yaml b/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-centos-7/run.yaml index 2c366587..bbbeae90 100644 --- a/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-centos-7/run.yaml +++ b/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-centos-7/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-puppet-openstackci-puppet-beaker-rspec-centos-7 from old job gate-puppet-openstackci-puppet-beaker-rspec-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -68,11 +71,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-ubuntu-trusty/run.yaml b/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-ubuntu-trusty/run.yaml index f1caee63..fce2d19c 100644 --- a/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-ubuntu-trusty/run.yaml +++ b/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec-ubuntu-trusty/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-puppet-openstackci-puppet-beaker-rspec-ubuntu-trusty from old job gate-puppet-openstackci-puppet-beaker-rspec-ubuntu-trusty + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -68,11 +71,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec/run.yaml b/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec/run.yaml index 4bb0a4cc..30c9c9d4 100644 --- a/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec/run.yaml +++ b/playbooks/legacy/puppet-openstackci-puppet-beaker-rspec/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-puppet-openstackci-puppet-beaker-rspec from old job gate-puppet-openstackci-puppet-beaker-rspec-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -68,11 +71,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-syntax-3-centos-7/run.yaml b/playbooks/legacy/puppet-syntax-3-centos-7/run.yaml index 5462c350..ef819816 100644 --- a/playbooks/legacy/puppet-syntax-3-centos-7/run.yaml +++ b/playbooks/legacy/puppet-syntax-3-centos-7/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-puppet-syntax-3-legacy-centos-7 from old job gate-{name}-puppet-syntax-3-legacy-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-syntax-3/run.yaml b/playbooks/legacy/puppet-syntax-3/run.yaml index f7c7458d..b459045a 100644 --- a/playbooks/legacy/puppet-syntax-3/run.yaml +++ b/playbooks/legacy/puppet-syntax-3/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-puppet-syntax-3 from old job gate-{name}-puppet-syntax-3-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-syntax-4-centos-7/run.yaml b/playbooks/legacy/puppet-syntax-4-centos-7/run.yaml index 536c4459..f510d370 100644 --- a/playbooks/legacy/puppet-syntax-4-centos-7/run.yaml +++ b/playbooks/legacy/puppet-syntax-4-centos-7/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-puppet-syntax-4-centos-7 from old job gate-{name}-puppet-syntax-4-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-unit-3.6-centos-7/run.yaml b/playbooks/legacy/puppet-unit-3.6-centos-7/run.yaml index f2c8424f..04157792 100644 --- a/playbooks/legacy/puppet-unit-3.6-centos-7/run.yaml +++ b/playbooks/legacy/puppet-unit-3.6-centos-7/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-puppet-unit-3.6-legacy-centos-7 from old job gate-{name}-puppet-unit-3.6-legacy-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-unit-3.8-centos-7/run.yaml b/playbooks/legacy/puppet-unit-3.8-centos-7/run.yaml index 4aa30680..5c6bdbf7 100644 --- a/playbooks/legacy/puppet-unit-3.8-centos-7/run.yaml +++ b/playbooks/legacy/puppet-unit-3.8-centos-7/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-puppet-unit-3.8-legacy-centos-7 from old job gate-{name}-puppet-unit-3.8-legacy-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-unit-4.8-centos-7/run.yaml b/playbooks/legacy/puppet-unit-4.8-centos-7/run.yaml index faa238ee..3b41bc24 100644 --- a/playbooks/legacy/puppet-unit-4.8-centos-7/run.yaml +++ b/playbooks/legacy/puppet-unit-4.8-centos-7/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-puppet-unit-4.8-centos-7 from old job gate-{name}-puppet-unit-4.8-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -46,11 +49,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/puppet-unit-latest-centos-7/run.yaml b/playbooks/legacy/puppet-unit-latest-centos-7/run.yaml index 35dcedc5..8dbaf8e6 100644 --- a/playbooks/legacy/puppet-unit-latest-centos-7/run.yaml +++ b/playbooks/legacy/puppet-unit-latest-centos-7/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-puppet-unit-latest-centos-7 from old job gate-{name}-puppet-unit-latest-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/sahara-extra-artifacts/run.yaml b/playbooks/legacy/sahara-extra-artifacts/run.yaml index 9f2e5507..67c1c65b 100644 --- a/playbooks/legacy/sahara-extra-artifacts/run.yaml +++ b/playbooks/legacy/sahara-extra-artifacts/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-sahara-extra-artifacts from old job gate-sahara-extra-artifacts + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/sandbox-tag/run.yaml b/playbooks/legacy/sandbox-tag/run.yaml index 425092d4..70bcb0ff 100644 --- a/playbooks/legacy/sandbox-tag/run.yaml +++ b/playbooks/legacy/sandbox-tag/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-sandbox-tag from old job sandbox-tag + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/storyboard-js-integration-ubuntu-trusty/run.yaml b/playbooks/legacy/storyboard-js-integration-ubuntu-trusty/run.yaml index 1f6b5aff..d5072274 100644 --- a/playbooks/legacy/storyboard-js-integration-ubuntu-trusty/run.yaml +++ b/playbooks/legacy/storyboard-js-integration-ubuntu-trusty/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-storyboard-js-integration-ubuntu-trusty from old job gate-storyboard-js-integration-ubuntu-trusty + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -37,11 +40,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/storyboard-js-integration/run.yaml b/playbooks/legacy/storyboard-js-integration/run.yaml index 75187336..54300593 100644 --- a/playbooks/legacy/storyboard-js-integration/run.yaml +++ b/playbooks/legacy/storyboard-js-integration/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-storyboard-js-integration from old job gate-storyboard-js-integration-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/system-config-puppet-syntax-3/run.yaml b/playbooks/legacy/system-config-puppet-syntax-3/run.yaml index 5c8a92f5..3ec2b5ba 100644 --- a/playbooks/legacy/system-config-puppet-syntax-3/run.yaml +++ b/playbooks/legacy/system-config-puppet-syntax-3/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-system-config-puppet-syntax-3 from old job gate-system-config-puppet-syntax-3-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e diff --git a/playbooks/legacy/zmq-event-publisher-hpi-artifact/run.yaml b/playbooks/legacy/zmq-event-publisher-hpi-artifact/run.yaml index 10a8788d..47dd4996 100644 --- a/playbooks/legacy/zmq-event-publisher-hpi-artifact/run.yaml +++ b/playbooks/legacy/zmq-event-publisher-hpi-artifact/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-zmq-event-publisher-hpi-artifact from old job zmq-event-publisher-hpi-artifact + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -36,11 +39,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x diff --git a/playbooks/legacy/zmq-event-publisher-maven-build-ubuntu-trusty/run.yaml b/playbooks/legacy/zmq-event-publisher-maven-build-ubuntu-trusty/run.yaml index ce571ea2..b48e1b77 100644 --- a/playbooks/legacy/zmq-event-publisher-maven-build-ubuntu-trusty/run.yaml +++ b/playbooks/legacy/zmq-event-publisher-maven-build-ubuntu-trusty/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-zmq-event-publisher-maven-build-ubuntu-trusty from old job gate-zmq-event-publisher-maven-build-ubuntu-trusty + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -37,11 +40,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -x