From ec9369b1679a49b365fa914527f47c9b59a986d5 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 20 Apr 2018 15:19:49 -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: If4a5b5c1d85e1491c1544378479c0fc82ad2af03 Signed-off-by: Paul Belanger --- .../legacy/ironic-python-agent-buildimage-coreos/run.yaml | 8 +++----- .../ironic-python-agent-buildimage-tinyipa/run.yaml | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/playbooks/legacy/ironic-python-agent-buildimage-coreos/run.yaml b/playbooks/legacy/ironic-python-agent-buildimage-coreos/run.yaml index ee3f0111d..98ceea73b 100644 --- a/playbooks/legacy/ironic-python-agent-buildimage-coreos/run.yaml +++ b/playbooks/legacy/ironic-python-agent-buildimage-coreos/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-ironic-python-agent-buildimage-coreos from old job ironic-python-agent-buildimage-coreos-ubuntu-xenial + 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/ironic-python-agent-buildimage-tinyipa/run.yaml b/playbooks/legacy/ironic-python-agent-buildimage-tinyipa/run.yaml index feeb4874f..ca9ccf619 100644 --- a/playbooks/legacy/ironic-python-agent-buildimage-tinyipa/run.yaml +++ b/playbooks/legacy/ironic-python-agent-buildimage-tinyipa/run.yaml @@ -1,6 +1,9 @@ - hosts: all name: Autoconverted job legacy-ironic-python-agent-buildimage-tinyipa from old job ironic-python-agent-buildimage-tinyipa-ubuntu-xenial + 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