From 209182c3eed1e6e98db52371b4eafa7b71df3a4d Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 20 Apr 2018 16:09:29 -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: I6b07be9b7912ff226991552b9be6dc9999416b56
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
playbooks/legacy/bandit-integration-barbican/run.yaml | 8 +++-----
playbooks/legacy/bandit-integration-glance/run.yaml | 8 +++-----
playbooks/legacy/bandit-integration-glance_store/run.yaml | 8 +++-----
playbooks/legacy/bandit-integration-keystone/run.yaml | 8 +++-----
.../legacy/bandit-integration-keystonemiddleware/run.yaml | 8 +++-----
playbooks/legacy/bandit-integration-magnum/run.yaml | 8 +++-----
playbooks/legacy/bandit-integration-oslo.config/run.yaml | 8 +++-----
playbooks/legacy/bandit-integration-oslo.log/run.yaml | 8 +++-----
playbooks/legacy/bandit-integration-oslo.service/run.yaml | 8 +++-----
playbooks/legacy/bandit-integration-oslo.utils/run.yaml | 8 +++-----
playbooks/legacy/bandit-integration-oslo.vmware/run.yaml | 8 +++-----
.../bandit-integration-python-keystoneclient/run.yaml | 8 +++-----
.../bandit-integration-python-magnumclient/run.yaml | 8 +++-----
playbooks/legacy/bandit-integration-sahara/run.yaml | 8 +++-----
14 files changed, 42 insertions(+), 70 deletions(-)
diff --git a/playbooks/legacy/bandit-integration-barbican/run.yaml b/playbooks/legacy/bandit-integration-barbican/run.yaml
index 47e9b291..366bb9df 100644
--- a/playbooks/legacy/bandit-integration-barbican/run.yaml
+++ b/playbooks/legacy/bandit-integration-barbican/run.yaml
@@ -1,5 +1,8 @@
- hosts: all
name: Autoconverted job legacy-bandit-integration-barbican from old job gate-bandit-integration-barbican
+ 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 -u
diff --git a/playbooks/legacy/bandit-integration-glance/run.yaml b/playbooks/legacy/bandit-integration-glance/run.yaml
index d8d73950..2883cab5 100644
--- a/playbooks/legacy/bandit-integration-glance/run.yaml
+++ b/playbooks/legacy/bandit-integration-glance/run.yaml
@@ -1,5 +1,8 @@
- hosts: all
name: Autoconverted job legacy-bandit-integration-glance from old job gate-bandit-integration-glance
+ 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 -u
diff --git a/playbooks/legacy/bandit-integration-glance_store/run.yaml b/playbooks/legacy/bandit-integration-glance_store/run.yaml
index 46c7e1fe..c28c7339 100644
--- a/playbooks/legacy/bandit-integration-glance_store/run.yaml
+++ b/playbooks/legacy/bandit-integration-glance_store/run.yaml
@@ -1,5 +1,8 @@
- hosts: all
name: Autoconverted job legacy-bandit-integration-glance_store from old job gate-bandit-integration-glance_store
+ 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 -u
diff --git a/playbooks/legacy/bandit-integration-keystone/run.yaml b/playbooks/legacy/bandit-integration-keystone/run.yaml
index ab3ceaa8..a2fe73f6 100644
--- a/playbooks/legacy/bandit-integration-keystone/run.yaml
+++ b/playbooks/legacy/bandit-integration-keystone/run.yaml
@@ -1,5 +1,8 @@
- hosts: all
name: Autoconverted job legacy-bandit-integration-keystone from old job gate-bandit-integration-keystone
+ 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 -u
diff --git a/playbooks/legacy/bandit-integration-keystonemiddleware/run.yaml b/playbooks/legacy/bandit-integration-keystonemiddleware/run.yaml
index ed1a862a..3247d8cb 100644
--- a/playbooks/legacy/bandit-integration-keystonemiddleware/run.yaml
+++ b/playbooks/legacy/bandit-integration-keystonemiddleware/run.yaml
@@ -1,6 +1,9 @@
- hosts: all
name: Autoconverted job legacy-bandit-integration-keystonemiddleware from old job
gate-bandit-integration-keystonemiddleware
+ roles:
+ - bindep
+
tasks:
- name: Ensure legacy workspace directory
@@ -8,11 +11,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 -u
diff --git a/playbooks/legacy/bandit-integration-magnum/run.yaml b/playbooks/legacy/bandit-integration-magnum/run.yaml
index ca9e8b2d..e4e759ff 100644
--- a/playbooks/legacy/bandit-integration-magnum/run.yaml
+++ b/playbooks/legacy/bandit-integration-magnum/run.yaml
@@ -1,5 +1,8 @@
- hosts: all
name: Autoconverted job legacy-bandit-integration-magnum from old job gate-bandit-integration-magnum
+ 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 -u
diff --git a/playbooks/legacy/bandit-integration-oslo.config/run.yaml b/playbooks/legacy/bandit-integration-oslo.config/run.yaml
index 03207d4e..ab4265ad 100644
--- a/playbooks/legacy/bandit-integration-oslo.config/run.yaml
+++ b/playbooks/legacy/bandit-integration-oslo.config/run.yaml
@@ -1,5 +1,8 @@
- hosts: all
name: Autoconverted job legacy-bandit-integration-oslo.config from old job gate-bandit-integration-oslo.config
+ 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 -u
diff --git a/playbooks/legacy/bandit-integration-oslo.log/run.yaml b/playbooks/legacy/bandit-integration-oslo.log/run.yaml
index d940c775..f2d166de 100644
--- a/playbooks/legacy/bandit-integration-oslo.log/run.yaml
+++ b/playbooks/legacy/bandit-integration-oslo.log/run.yaml
@@ -1,5 +1,8 @@
- hosts: all
name: Autoconverted job legacy-bandit-integration-oslo.log from old job gate-bandit-integration-oslo.log
+ 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 -u
diff --git a/playbooks/legacy/bandit-integration-oslo.service/run.yaml b/playbooks/legacy/bandit-integration-oslo.service/run.yaml
index 832a54c4..6e39a505 100644
--- a/playbooks/legacy/bandit-integration-oslo.service/run.yaml
+++ b/playbooks/legacy/bandit-integration-oslo.service/run.yaml
@@ -1,5 +1,8 @@
- hosts: all
name: Autoconverted job legacy-bandit-integration-oslo.service from old job gate-bandit-integration-oslo.service
+ 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 -u
diff --git a/playbooks/legacy/bandit-integration-oslo.utils/run.yaml b/playbooks/legacy/bandit-integration-oslo.utils/run.yaml
index 5bfcea43..ff4bb5f4 100644
--- a/playbooks/legacy/bandit-integration-oslo.utils/run.yaml
+++ b/playbooks/legacy/bandit-integration-oslo.utils/run.yaml
@@ -1,5 +1,8 @@
- hosts: all
name: Autoconverted job legacy-bandit-integration-oslo.utils from old job gate-bandit-integration-oslo.utils
+ 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 -u
diff --git a/playbooks/legacy/bandit-integration-oslo.vmware/run.yaml b/playbooks/legacy/bandit-integration-oslo.vmware/run.yaml
index 49a7e005..ede34274 100644
--- a/playbooks/legacy/bandit-integration-oslo.vmware/run.yaml
+++ b/playbooks/legacy/bandit-integration-oslo.vmware/run.yaml
@@ -1,5 +1,8 @@
- hosts: all
name: Autoconverted job legacy-bandit-integration-oslo.vmware from old job gate-bandit-integration-oslo.vmware
+ 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 -u
diff --git a/playbooks/legacy/bandit-integration-python-keystoneclient/run.yaml b/playbooks/legacy/bandit-integration-python-keystoneclient/run.yaml
index fd2960b9..adc6ef83 100644
--- a/playbooks/legacy/bandit-integration-python-keystoneclient/run.yaml
+++ b/playbooks/legacy/bandit-integration-python-keystoneclient/run.yaml
@@ -1,6 +1,9 @@
- hosts: all
name: Autoconverted job legacy-bandit-integration-python-keystoneclient from old
job gate-bandit-integration-python-keystoneclient
+ roles:
+ - bindep
+
tasks:
- name: Ensure legacy workspace directory
@@ -8,11 +11,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 -u
diff --git a/playbooks/legacy/bandit-integration-python-magnumclient/run.yaml b/playbooks/legacy/bandit-integration-python-magnumclient/run.yaml
index 409f56d2..ed849f5c 100644
--- a/playbooks/legacy/bandit-integration-python-magnumclient/run.yaml
+++ b/playbooks/legacy/bandit-integration-python-magnumclient/run.yaml
@@ -1,6 +1,9 @@
- hosts: all
name: Autoconverted job legacy-bandit-integration-python-magnumclient from old job
gate-bandit-integration-python-magnumclient
+ roles:
+ - bindep
+
tasks:
- name: Ensure legacy workspace directory
@@ -8,11 +11,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 -u
diff --git a/playbooks/legacy/bandit-integration-sahara/run.yaml b/playbooks/legacy/bandit-integration-sahara/run.yaml
index 874a12a6..ebd415d1 100644
--- a/playbooks/legacy/bandit-integration-sahara/run.yaml
+++ b/playbooks/legacy/bandit-integration-sahara/run.yaml
@@ -1,5 +1,8 @@
- hosts: all
name: Autoconverted job legacy-bandit-integration-sahara from old job gate-bandit-integration-sahara
+ 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 -u