From 4a9fe4b133459286fd32c51b919d2e537dbf882d Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 20 Apr 2018 16:03:13 -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. Change-Id: I80b1cfd20e013ef89eb9f64b38f9ee083f600e81 Signed-off-by: Paul Belanger --- .../run.yaml | 13 +++---------- .../run.yaml | 13 +++---------- .../dib-dsvm-functests-python2-centos-7/run.yaml | 13 +++---------- .../run.yaml | 13 +++---------- .../run.yaml | 13 +++---------- .../run.yaml | 13 +++---------- .../run.yaml | 13 +++---------- .../dib-dsvm-functests-python3-extras/run.yaml | 13 +++---------- .../dib-dsvm-functests-python3-image/run.yaml | 13 +++---------- .../run.yaml | 13 +++---------- .../legacy/dib-dsvm-functests-python3/run.yaml | 13 +++---------- 11 files changed, 33 insertions(+), 110 deletions(-) diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml index 2b2a3bc84..ea3e3c498 100644 --- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml +++ b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-dib-dsvm-functests-python2-centos-7-extras from old job gate-dib-dsvm-functests-python2-centos-7-extras-nv + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -23,16 +26,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - cd ~/openstack/diskimage-builder - /usr/local/jenkins/slave_scripts/install-distro-packages.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml index f54176cad..308201116 100644 --- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml +++ b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-dib-dsvm-functests-python2-centos-7-image from old job gate-dib-dsvm-functests-python2-centos-7-image-nv + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -23,16 +26,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - cd ~/openstack/diskimage-builder - /usr/local/jenkins/slave_scripts/install-distro-packages.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml index 3ea53443c..39e8eafce 100644 --- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml +++ b/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-dib-dsvm-functests-python2-centos-7 from old job gate-dib-dsvm-functests-python2-centos-7 + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -23,16 +26,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - cd ~/openstack/diskimage-builder - /usr/local/jenkins/slave_scripts/install-distro-packages.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml index ef67e2a95..b3947d222 100644 --- a/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml +++ b/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-dib-dsvm-functests-python2-opensuse-423 from old job gate-dib-dsvm-functests-python2-opensuse-423-nv + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -23,16 +26,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - cd ~/openstack/diskimage-builder - /usr/local/jenkins/slave_scripts/install-distro-packages.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml index da955d04f..61013d2fb 100644 --- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml +++ b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-dib-dsvm-functests-python2-ubuntu-trusty-extras from old job gate-dib-dsvm-functests-python2-ubuntu-trusty-extras-nv + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -23,16 +26,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - cd ~/openstack/diskimage-builder - /usr/local/jenkins/slave_scripts/install-distro-packages.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml index 736179ddd..bd08b9526 100644 --- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml +++ b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-dib-dsvm-functests-python2-ubuntu-trusty-image from old job gate-dib-dsvm-functests-python2-ubuntu-trusty-image-nv + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -23,16 +26,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - cd ~/openstack/diskimage-builder - /usr/local/jenkins/slave_scripts/install-distro-packages.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml index 5ebe0bcd4..773e8f725 100644 --- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml +++ b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-dib-dsvm-functests-python2-ubuntu-trusty from old job gate-dib-dsvm-functests-python2-ubuntu-trusty + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -23,16 +26,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - cd ~/openstack/diskimage-builder - /usr/local/jenkins/slave_scripts/install-distro-packages.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml index bb5c122f2..fd41700e2 100644 --- a/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml +++ b/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-dib-dsvm-functests-python3-extras from old job gate-dib-dsvm-functests-python3-ubuntu-xenial-extras-nv + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -22,16 +25,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - cd ~/openstack/diskimage-builder - /usr/local/jenkins/slave_scripts/install-distro-packages.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml index 462b856a0..224b81ec1 100644 --- a/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml +++ b/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-dib-dsvm-functests-python3-image from old job gate-dib-dsvm-functests-python3-ubuntu-xenial-image-nv + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -22,16 +25,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - cd ~/openstack/diskimage-builder - /usr/local/jenkins/slave_scripts/install-distro-packages.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml index 1d9de73c2..a9fc615e2 100644 --- a/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml +++ b/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-dib-dsvm-functests-python3-opensuse-423 from old job gate-dib-dsvm-functests-python3-opensuse-423-nv + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -23,16 +26,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - cd ~/openstack/diskimage-builder - /usr/local/jenkins/slave_scripts/install-distro-packages.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u diff --git a/playbooks/legacy/dib-dsvm-functests-python3/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3/run.yaml index dff4d3386..840643ffc 100644 --- a/playbooks/legacy/dib-dsvm-functests-python3/run.yaml +++ b/playbooks/legacy/dib-dsvm-functests-python3/run.yaml @@ -1,5 +1,8 @@ - hosts: all name: Autoconverted job legacy-dib-dsvm-functests-python3 from old job gate-dib-dsvm-functests-python3-ubuntu-xenial + roles: + - bindep + tasks: - name: Ensure legacy workspace directory @@ -22,16 +25,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - cd ~/openstack/diskimage-builder - /usr/local/jenkins/slave_scripts/install-distro-packages.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -u