summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen@gazlene.net>2018-06-02 21:03:59 +0200
committerColleen Murphy <colleen.murphy@suse.de>2018-06-07 16:34:38 +0200
commit0455113a0758ef79f14416c8bb7259ebeabf4b75 (patch)
treec18b27920eca476c23a8d68c9b9db12e1368fa3d
parentd2dc5dd2072fd86b7abfffb16b127c6ff16b32d5 (diff)
Convert puppet-openstackci jobs to zuulv3
This patch moves the puppet-openstackci beaker jobs out of legacy. Since this job is essentially the same as the regular beaker jobs, we don't need new playbooks, we just need to adjust the beaker-rspec playbooks to run the puppet-openstackci tests. Since this was the last legacy job in the infra-puppet-apply-jobs template, move it out of the legacy templates to the regular templates. This doesn't remove the legacy-puppet-openstackci-beaker-rspec jobs or their parent legacy-openstackci-base since those are still defined in project-config. Change-Id: I7f7cb133fc41eba07da224291b7f2d0659b0deb6
Notes
Notes (review): Code-Review+2: Andreas Jaeger <jaegerandi@gmail.com> Code-Review+2: Mohammed Naser <mnaser@vexxhost.com> Workflow+1: Mohammed Naser <mnaser@vexxhost.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 07 Jun 2018 16:07:01 +0000 Reviewed-on: https://review.openstack.org/571937 Project: openstack-infra/openstack-zuul-jobs Branch: refs/heads/master
-rw-r--r--playbooks/infra-puppet-beaker-rspec/run.yaml2
-rw-r--r--playbooks/legacy/openstackci-beaker-centos-7/run.yaml95
-rw-r--r--playbooks/legacy/openstackci-beaker-ubuntu-trusty/run.yaml95
-rw-r--r--playbooks/legacy/openstackci-beaker/run.yaml95
-rw-r--r--zuul.d/jobs.yaml21
-rw-r--r--zuul.d/project-templates.yaml23
-rw-r--r--zuul.d/zuul-legacy-jobs.yaml205
-rw-r--r--zuul.d/zuul-legacy-project-templates.yaml25
8 files changed, 147 insertions, 414 deletions
diff --git a/playbooks/infra-puppet-beaker-rspec/run.yaml b/playbooks/infra-puppet-beaker-rspec/run.yaml
index 08f36fe..f3a5ccd 100644
--- a/playbooks/infra-puppet-beaker-rspec/run.yaml
+++ b/playbooks/infra-puppet-beaker-rspec/run.yaml
@@ -48,6 +48,6 @@
48 export BEAKER_debug=yes 48 export BEAKER_debug=yes
49 export BEAKER_color=no 49 export BEAKER_color=no
50 $GEM_HOME/bin/bundle exec rspec spec/acceptance 50 $GEM_HOME/bin/bundle exec rspec spec/acceptance
51 chdir: "{{ zuul.project.src_dir }}" 51 chdir: "{{ project_src_dir }}"
52 environment: 52 environment:
53 'GEM_HOME': "{{ ansible_user_dir }}/.bundled_gems" 53 'GEM_HOME': "{{ ansible_user_dir }}/.bundled_gems"
diff --git a/playbooks/legacy/openstackci-beaker-centos-7/run.yaml b/playbooks/legacy/openstackci-beaker-centos-7/run.yaml
deleted file mode 100644
index 0377dad..0000000
--- a/playbooks/legacy/openstackci-beaker-centos-7/run.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
1- hosts: all
2 name: Autoconverted job legacy-openstackci-beaker-centos-7 from old job gate-openstackci-beaker-centos-7
3 tasks:
4
5 - name: Ensure legacy workspace directory
6 file:
7 path: '{{ ansible_user_dir }}/workspace'
8 state: directory
9
10 - shell:
11 cmd: |
12 /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
13 git://git.openstack.org openstack-infra/puppet-openstackci
14 executable: /bin/bash
15 chdir: '{{ ansible_user_dir }}/workspace'
16 environment: '{{ zuul | zuul_legacy_vars }}'
17
18 - shell:
19 cmd: |
20 set -e
21 set -x
22 /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
23 git://git.openstack.org openstack-infra/puppet-openstack_infra_spec_helper
24 executable: /bin/bash
25 chdir: '{{ ansible_user_dir }}/workspace'
26 environment: '{{ zuul | zuul_legacy_vars }}'
27
28 - shell:
29 cmd: |
30 set -e
31 set -x
32 if [ -f /usr/bin/yum ]; then
33 sudo yum -y remove rdo-release "centos-release-openstack-*" "centos-release-ceph-*"
34 sudo yum -y install libxml2-devel libxslt-devel ruby-devel zlib-devel
35 sudo yum -y groupinstall "Development Tools"
36 # Uninstall python-requests from pip, since we install it in
37 # system-config/install_puppet.sh
38 sudo pip uninstall requests -y || true
39 elif [ -f /usr/bin/apt-get ]; then
40 sudo apt-get update
41 sudo apt-get install -y libxml2-dev libxslt-dev ruby-dev zlib1g-dev
42 fi
43 executable: /bin/bash
44 chdir: '{{ ansible_user_dir }}/workspace'
45 environment: '{{ zuul | zuul_legacy_vars }}'
46
47 - shell:
48 cmd: |
49 echo "" | sudo tee -a /etc/ssh/sshd_config
50 echo "Match address 127.0.0.1" | sudo tee -a /etc/ssh/sshd_config
51 echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
52 echo "" | sudo tee -a /etc/ssh/sshd_config
53 echo "Match address ::1" | sudo tee -a /etc/ssh/sshd_config
54 echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
55 mkdir -p .ssh
56 ssh-keygen -f ~/.ssh/id_rsa -b 2048 -P ""
57 sudo mkdir -p /root/.ssh
58 cat ~/.ssh/id_rsa.pub | sudo tee -a /root/.ssh/authorized_keys
59 if [ -f /usr/bin/yum ]; then
60 sudo systemctl reload sshd
61 elif [ -f /usr/bin/apt-get ]; then
62 sudo service ssh restart
63 fi
64 executable: /bin/bash
65 chdir: '{{ ansible_user_dir }}/workspace'
66 environment: '{{ zuul | zuul_legacy_vars }}'
67
68 - shell:
69 cmd: |
70 sudo gem install bundler --no-rdoc --no-ri --verbose
71 chdir: '{{ ansible_user_dir }}/workspace'
72 environment: '{{ zuul | zuul_legacy_vars }}'
73
74 - shell:
75 cmd: |
76 set -x
77 sudo rm -f /etc/sudoers.d/zuul
78 # Prove that general sudo access is actually revoked
79 ! sudo -n true
80 executable: /bin/bash
81 chdir: '{{ ansible_user_dir }}/workspace'
82 environment: '{{ zuul | zuul_legacy_vars }}'
83
84 - shell:
85 cmd: |
86 cd openstack-infra/puppet-openstackci
87 mkdir .bundled_gems
88 export GEM_HOME=`pwd`/.bundled_gems
89 bundle install
90 export BEAKER_set=nodepool-centos7
91 export BEAKER_debug=yes
92 export BEAKER_color=no
93 bundle exec rspec spec/acceptance
94 chdir: '{{ ansible_user_dir }}/workspace'
95 environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/openstackci-beaker-ubuntu-trusty/run.yaml b/playbooks/legacy/openstackci-beaker-ubuntu-trusty/run.yaml
deleted file mode 100644
index a535287..0000000
--- a/playbooks/legacy/openstackci-beaker-ubuntu-trusty/run.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
1- hosts: all
2 name: Autoconverted job legacy-openstackci-beaker-ubuntu-trusty from old job gate-openstackci-beaker-ubuntu-trusty
3 tasks:
4
5 - name: Ensure legacy workspace directory
6 file:
7 path: '{{ ansible_user_dir }}/workspace'
8 state: directory
9
10 - shell:
11 cmd: |
12 /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
13 git://git.openstack.org openstack-infra/puppet-openstackci
14 executable: /bin/bash
15 chdir: '{{ ansible_user_dir }}/workspace'
16 environment: '{{ zuul | zuul_legacy_vars }}'
17
18 - shell:
19 cmd: |
20 set -e
21 set -x
22 /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
23 git://git.openstack.org openstack-infra/puppet-openstack_infra_spec_helper
24 executable: /bin/bash
25 chdir: '{{ ansible_user_dir }}/workspace'
26 environment: '{{ zuul | zuul_legacy_vars }}'
27
28 - shell:
29 cmd: |
30 set -e
31 set -x
32 if [ -f /usr/bin/yum ]; then
33 sudo yum -y remove rdo-release "centos-release-openstack-*" "centos-release-ceph-*"
34 sudo yum -y install libxml2-devel libxslt-devel ruby-devel zlib-devel
35 sudo yum -y groupinstall "Development Tools"
36 # Uninstall python-requests from pip, since we install it in
37 # system-config/install_puppet.sh
38 sudo pip uninstall requests -y || true
39 elif [ -f /usr/bin/apt-get ]; then
40 sudo apt-get update
41 sudo apt-get install -y libxml2-dev libxslt-dev ruby-dev zlib1g-dev
42 fi
43 executable: /bin/bash
44 chdir: '{{ ansible_user_dir }}/workspace'
45 environment: '{{ zuul | zuul_legacy_vars }}'
46
47 - shell:
48 cmd: |
49 echo "" | sudo tee -a /etc/ssh/sshd_config
50 echo "Match address 127.0.0.1" | sudo tee -a /etc/ssh/sshd_config
51 echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
52 echo "" | sudo tee -a /etc/ssh/sshd_config
53 echo "Match address ::1" | sudo tee -a /etc/ssh/sshd_config
54 echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
55 mkdir -p .ssh
56 ssh-keygen -f ~/.ssh/id_rsa -b 2048 -P ""
57 sudo mkdir -p /root/.ssh
58 cat ~/.ssh/id_rsa.pub | sudo tee -a /root/.ssh/authorized_keys
59 if [ -f /usr/bin/yum ]; then
60 sudo systemctl reload sshd
61 elif [ -f /usr/bin/apt-get ]; then
62 sudo service ssh restart
63 fi
64 executable: /bin/bash
65 chdir: '{{ ansible_user_dir }}/workspace'
66 environment: '{{ zuul | zuul_legacy_vars }}'
67
68 - shell:
69 cmd: |
70 sudo gem install bundler --no-rdoc --no-ri --verbose
71 chdir: '{{ ansible_user_dir }}/workspace'
72 environment: '{{ zuul | zuul_legacy_vars }}'
73
74 - shell:
75 cmd: |
76 set -x
77 sudo rm -f /etc/sudoers.d/zuul
78 # Prove that general sudo access is actually revoked
79 ! sudo -n true
80 executable: /bin/bash
81 chdir: '{{ ansible_user_dir }}/workspace'
82 environment: '{{ zuul | zuul_legacy_vars }}'
83
84 - shell:
85 cmd: |
86 cd openstack-infra/puppet-openstackci
87 mkdir .bundled_gems
88 export GEM_HOME=`pwd`/.bundled_gems
89 bundle install
90 export BEAKER_set=nodepool-trusty
91 export BEAKER_debug=yes
92 export BEAKER_color=no
93 bundle exec rspec spec/acceptance
94 chdir: '{{ ansible_user_dir }}/workspace'
95 environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/openstackci-beaker/run.yaml b/playbooks/legacy/openstackci-beaker/run.yaml
deleted file mode 100644
index 5180df4..0000000
--- a/playbooks/legacy/openstackci-beaker/run.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
1- hosts: all
2 name: Autoconverted job legacy-openstackci-beaker from old job gate-openstackci-beaker-ubuntu-xenial
3 tasks:
4
5 - name: Ensure legacy workspace directory
6 file:
7 path: '{{ ansible_user_dir }}/workspace'
8 state: directory
9
10 - shell:
11 cmd: |
12 /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
13 git://git.openstack.org openstack-infra/puppet-openstackci
14 executable: /bin/bash
15 chdir: '{{ ansible_user_dir }}/workspace'
16 environment: '{{ zuul | zuul_legacy_vars }}'
17
18 - shell:
19 cmd: |
20 set -e
21 set -x
22 /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
23 git://git.openstack.org openstack-infra/puppet-openstack_infra_spec_helper
24 executable: /bin/bash
25 chdir: '{{ ansible_user_dir }}/workspace'
26 environment: '{{ zuul | zuul_legacy_vars }}'
27
28 - shell:
29 cmd: |
30 set -e
31 set -x
32 if [ -f /usr/bin/yum ]; then
33 sudo yum -y remove rdo-release "centos-release-openstack-*" "centos-release-ceph-*"
34 sudo yum -y install libxml2-devel libxslt-devel ruby-devel zlib-devel
35 sudo yum -y groupinstall "Development Tools"
36 # Uninstall python-requests from pip, since we install it in
37 # system-config/install_puppet.sh
38 sudo pip uninstall requests -y || true
39 elif [ -f /usr/bin/apt-get ]; then
40 sudo apt-get update
41 sudo apt-get install -y libxml2-dev libxslt-dev ruby-dev zlib1g-dev
42 fi
43 executable: /bin/bash
44 chdir: '{{ ansible_user_dir }}/workspace'
45 environment: '{{ zuul | zuul_legacy_vars }}'
46
47 - shell:
48 cmd: |
49 echo "" | sudo tee -a /etc/ssh/sshd_config
50 echo "Match address 127.0.0.1" | sudo tee -a /etc/ssh/sshd_config
51 echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
52 echo "" | sudo tee -a /etc/ssh/sshd_config
53 echo "Match address ::1" | sudo tee -a /etc/ssh/sshd_config
54 echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
55 mkdir -p .ssh
56 ssh-keygen -f ~/.ssh/id_rsa -b 2048 -P ""
57 sudo mkdir -p /root/.ssh
58 cat ~/.ssh/id_rsa.pub | sudo tee -a /root/.ssh/authorized_keys
59 if [ -f /usr/bin/yum ]; then
60 sudo systemctl reload sshd
61 elif [ -f /usr/bin/apt-get ]; then
62 sudo service ssh restart
63 fi
64 executable: /bin/bash
65 chdir: '{{ ansible_user_dir }}/workspace'
66 environment: '{{ zuul | zuul_legacy_vars }}'
67
68 - shell:
69 cmd: |
70 sudo gem install bundler --no-rdoc --no-ri --verbose
71 chdir: '{{ ansible_user_dir }}/workspace'
72 environment: '{{ zuul | zuul_legacy_vars }}'
73
74 - shell:
75 cmd: |
76 set -x
77 sudo rm -f /etc/sudoers.d/zuul
78 # Prove that general sudo access is actually revoked
79 ! sudo -n true
80 executable: /bin/bash
81 chdir: '{{ ansible_user_dir }}/workspace'
82 environment: '{{ zuul | zuul_legacy_vars }}'
83
84 - shell:
85 cmd: |
86 cd openstack-infra/puppet-openstackci
87 mkdir .bundled_gems
88 export GEM_HOME=`pwd`/.bundled_gems
89 bundle install
90 export BEAKER_set=nodepool-xenial
91 export BEAKER_debug=yes
92 export BEAKER_color=no
93 bundle exec rspec spec/acceptance
94 chdir: '{{ ansible_user_dir }}/workspace'
95 environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index e5d8025..8212373 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1241,6 +1241,7 @@
1241 run: playbooks/infra-puppet-beaker-rspec/run.yaml 1241 run: playbooks/infra-puppet-beaker-rspec/run.yaml
1242 vars: 1242 vars:
1243 nodeset: nodepool-xenial 1243 nodeset: nodepool-xenial
1244 project_src_dir: "{{ zuul.project.src_dir }}"
1244 timeout: 3600 1245 timeout: 3600
1245 irrelevant-files: 1246 irrelevant-files:
1246 - ^.*\.md$ 1247 - ^.*\.md$
@@ -1337,6 +1338,26 @@
1337 nodeset: nodepool-centos7 1338 nodeset: nodepool-centos7
1338 1339
1339- job: 1340- job:
1341 name: openstackci-beaker
1342 parent: puppet-beaker-rspec-infra
1343 vars:
1344 project_src_dir: "{{ zuul.projects['git.openstack.org/openstack-infra/puppet-openstackci'].src_dir }}"
1345
1346- job:
1347 name: openstackci-beaker-centos-7
1348 parent: openstackci-beaker
1349 nodeset: centos-7
1350 vars:
1351 nodeset: nodepool-centos7
1352
1353- job:
1354 name: openstackci-beaker-ubuntu-trusty
1355 parent: openstackci-beaker
1356 nodeset: ubuntu-trusty
1357 vars:
1358 nodeset: nodepool-trusty
1359
1360- job:
1340 name: ansible-role-functional-base 1361 name: ansible-role-functional-base
1341 abstract: true 1362 abstract: true
1342 parent: tox 1363 parent: tox
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index f614f12..47450a3 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -1061,3 +1061,26 @@
1061 gate: 1061 gate:
1062 jobs: 1062 jobs:
1063 - puppet-beaker-rspec-centos-7-infra 1063 - puppet-beaker-rspec-centos-7-infra
1064
1065- project-template:
1066 name: infra-puppet-apply-jobs
1067 check:
1068 jobs:
1069 - infra-puppet-apply-3-centos-7
1070 - infra-puppet-apply-3-ubuntu-trusty:
1071 branches: master
1072 - infra-puppet-apply-3-ubuntu-xenial
1073 - openstackci-beaker-centos-7
1074 - openstackci-beaker-ubuntu-trusty
1075 - openstackci-beaker:
1076 voting: false
1077 gate:
1078 jobs:
1079 - infra-puppet-apply-3-centos-7
1080 - infra-puppet-apply-3-ubuntu-trusty:
1081 branches: master
1082 - infra-puppet-apply-3-ubuntu-xenial
1083 - openstackci-beaker-centos-7
1084 - openstackci-beaker-ubuntu-trusty
1085 - infra-puppet-apply-4-centos-7
1086 - infra-puppet-apply-4-ubuntu-xenial
diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml
index b6c1405..eb9f429 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -1112,109 +1112,6 @@
1112 - openstack/requirements 1112 - openstack/requirements
1113 1113
1114- job: 1114- job:
1115 name: legacy-openstackci-base
1116 parent: legacy-base
1117 required-projects:
1118 - openstack-infra/project-config
1119 - openstack-infra/puppet-accessbot
1120 - openstack-infra/puppet-ansible
1121 - openstack-infra/puppet-askbot
1122 - openstack-infra/puppet-asterisk
1123 - openstack-infra/puppet-bandersnatch
1124 - openstack-infra/puppet-bugdaystats
1125 - openstack-infra/puppet-bup
1126 - openstack-infra/puppet-cgit
1127 - openstack-infra/puppet-diskimage_builder
1128 - openstack-infra/puppet-drupal
1129 - openstack-infra/puppet-elastic_recheck
1130 - openstack-infra/puppet-elasticsearch
1131 - openstack-infra/puppet-ethercalc
1132 - openstack-infra/puppet-etherpad_lite
1133 - openstack-infra/puppet-exim
1134 - openstack-infra/puppet-germqtt
1135 - openstack-infra/puppet-gerrit
1136 - openstack-infra/puppet-gerritbot
1137 - openstack-infra/puppet-github
1138 - openstack-infra/puppet-grafyaml
1139 - openstack-infra/puppet-graphite
1140 - openstack-infra/puppet-haveged
1141 - openstack-infra/puppet-hound
1142 - openstack-infra/puppet-httpd
1143 - openstack-infra/puppet-infracloud
1144 - openstack-infra/puppet-iptables
1145 - openstack-infra/puppet-jeepyb
1146 - openstack-infra/puppet-jenkins
1147 - openstack-infra/puppet-kerberos
1148 - openstack-infra/puppet-kibana
1149 - openstack-infra/puppet-lodgeit
1150 - openstack-infra/puppet-log_processor
1151 - openstack-infra/puppet-logrotate
1152 - openstack-infra/puppet-logstash
1153 - openstack-infra/puppet-lpmqtt
1154 - openstack-infra/puppet-mailman
1155 - openstack-infra/puppet-mediawiki
1156 - openstack-infra/puppet-meetbot
1157 - openstack-infra/puppet-mosquitto
1158 - openstack-infra/puppet-mqtt_statsd
1159 - openstack-infra/puppet-mysql_backup
1160 - openstack-infra/puppet-nodepool
1161 - openstack-infra/puppet-odsreg
1162 - openstack-infra/puppet-openafs
1163 - openstack-infra/puppet-openstackci
1164 - openstack-infra/puppet-openstack_health
1165 - openstack-infra/puppet-openstackid
1166 - openstack-infra/puppet-openstack_infra_spec_helper
1167 - openstack-infra/puppet-os_client_config
1168 - openstack-infra/puppet-packagekit
1169 - openstack-infra/puppet-pgsql_backup
1170 - openstack-infra/puppet-phabricator
1171 - openstack-infra/puppet-pip
1172 - openstack-infra/puppet-planet
1173 - openstack-infra/puppet-project_config
1174 - openstack-infra/puppet-ptgbot
1175 - openstack-infra/puppet-redis
1176 - openstack-infra/puppet-refstack
1177 - openstack-infra/puppet-reviewday
1178 - openstack-infra/puppet-simpleproxy
1179 - openstack-infra/puppet-snmpd
1180 - openstack-infra/puppet-ssh
1181 - openstack-infra/puppet-ssl_cert_check
1182 - openstack-infra/puppet-stackalytics
1183 - openstack-infra/puppet-statusbot
1184 - openstack-infra/puppet-storyboard
1185 - openstack-infra/puppet-subunit2sql
1186 - openstack-infra/puppet-sudoers
1187 - openstack-infra/puppet-tmpreaper
1188 - openstack-infra/puppet-ulimit
1189 - openstack-infra/puppet-unattended_upgrades
1190 - openstack-infra/puppet-unbound
1191 - openstack-infra/puppet-user
1192 - openstack-infra/puppet-zanata
1193 - openstack-infra/puppet-zuul
1194 - openstack/puppet-openstack-integration
1195 - openstack-infra/system-config
1196
1197- job:
1198 name: legacy-openstackci-beaker
1199 parent: legacy-openstackci-base
1200 run: playbooks/legacy/openstackci-beaker/run.yaml
1201 timeout: 3600
1202
1203- job:
1204 name: legacy-openstackci-beaker-centos-7
1205 parent: legacy-openstackci-base
1206 run: playbooks/legacy/openstackci-beaker-centos-7/run.yaml
1207 timeout: 3600
1208 nodeset: legacy-centos-7
1209
1210- job:
1211 name: legacy-openstackci-beaker-ubuntu-trusty
1212 parent: legacy-openstackci-base
1213 run: playbooks/legacy/openstackci-beaker-ubuntu-trusty/run.yaml
1214 timeout: 3600
1215 nodeset: legacy-ubuntu-trusty
1216
1217- job:
1218 name: legacy-ospurge-dsvm-functional 1115 name: legacy-ospurge-dsvm-functional
1219 parent: legacy-dsvm-base 1116 parent: legacy-dsvm-base
1220 run: playbooks/legacy/ospurge-dsvm-functional/run.yaml 1117 run: playbooks/legacy/ospurge-dsvm-functional/run.yaml
@@ -1661,6 +1558,108 @@
1661 - openstack-infra/puppet-openstackci 1558 - openstack-infra/puppet-openstackci
1662 1559
1663- job: 1560- job:
1561 name: legacy-openstackci-base
1562 parent: legacy-base
1563 required-projects:
1564 - openstack-infra/project-config
1565 - openstack-infra/puppet-accessbot
1566 - openstack-infra/puppet-ansible
1567 - openstack-infra/puppet-askbot
1568 - openstack-infra/puppet-asterisk
1569 - openstack-infra/puppet-bandersnatch
1570 - openstack-infra/puppet-bugdaystats
1571 - openstack-infra/puppet-bup
1572 - openstack-infra/puppet-cgit
1573 - openstack-infra/puppet-diskimage_builder
1574 - openstack-infra/puppet-drupal
1575 - openstack-infra/puppet-elastic_recheck
1576 - openstack-infra/puppet-elasticsearch
1577 - openstack-infra/puppet-ethercalc
1578 - openstack-infra/puppet-etherpad_lite
1579 - openstack-infra/puppet-exim
1580 - openstack-infra/puppet-germqtt
1581 - openstack-infra/puppet-gerrit
1582 - openstack-infra/puppet-gerritbot
1583 - openstack-infra/puppet-github
1584 - openstack-infra/puppet-grafyaml
1585 - openstack-infra/puppet-graphite
1586 - openstack-infra/puppet-haveged
1587 - openstack-infra/puppet-hound
1588 - openstack-infra/puppet-httpd
1589 - openstack-infra/puppet-bugdaystats
1590 - openstack-infra/puppet-bup
1591 - openstack-infra/puppet-cgit
1592 - openstack-infra/puppet-diskimage_builder
1593 - openstack-infra/puppet-drupal
1594 - openstack-infra/puppet-elastic_recheck
1595 - openstack-infra/puppet-elasticsearch
1596 - openstack-infra/puppet-ethercalc
1597 - openstack-infra/puppet-etherpad_lite
1598 - openstack-infra/puppet-exim
1599 - openstack-infra/puppet-germqtt
1600 - openstack-infra/puppet-gerrit
1601 - openstack-infra/puppet-gerritbot
1602 - openstack-infra/puppet-github
1603 - openstack-infra/puppet-grafyaml
1604 - openstack-infra/puppet-graphite
1605 - openstack-infra/puppet-haveged
1606 - openstack-infra/puppet-hound
1607 - openstack-infra/puppet-httpd
1608 - openstack-infra/puppet-infracloud
1609 - openstack-infra/puppet-iptables
1610 - openstack-infra/puppet-jeepyb
1611 - openstack-infra/puppet-jenkins
1612 - openstack-infra/puppet-kerberos
1613 - openstack-infra/puppet-kibana
1614 - openstack-infra/puppet-lodgeit
1615 - openstack-infra/puppet-log_processor
1616 - openstack-infra/puppet-logrotate
1617 - openstack-infra/puppet-logstash
1618 - openstack-infra/puppet-lpmqtt
1619 - openstack-infra/puppet-mailman
1620 - openstack-infra/puppet-mediawiki
1621 - openstack-infra/puppet-meetbot
1622 - openstack-infra/puppet-mosquitto
1623 - openstack-infra/puppet-mqtt_statsd
1624 - openstack-infra/puppet-mysql_backup
1625 - openstack-infra/puppet-nodepool
1626 - openstack-infra/puppet-odsreg
1627 - openstack-infra/puppet-openafs
1628 - openstack-infra/puppet-openstackci
1629 - openstack-infra/puppet-openstack_health
1630 - openstack-infra/puppet-openstackid
1631 - openstack-infra/puppet-openstack_infra_spec_helper
1632 - openstack-infra/puppet-os_client_config
1633 - openstack-infra/puppet-packagekit
1634 - openstack-infra/puppet-pgsql_backup
1635 - openstack-infra/puppet-phabricator
1636 - openstack-infra/puppet-pip
1637 - openstack-infra/puppet-planet
1638 - openstack-infra/puppet-project_config
1639 - openstack-infra/puppet-ptgbot
1640 - openstack-infra/puppet-redis
1641 - openstack-infra/puppet-refstack
1642 - openstack-infra/puppet-reviewday
1643 - openstack-infra/puppet-simpleproxy
1644 - openstack-infra/puppet-snmpd
1645 - openstack-infra/puppet-ssh
1646 - openstack-infra/puppet-ssl_cert_check
1647 - openstack-infra/puppet-stackalytics
1648 - openstack-infra/puppet-statusbot
1649 - openstack-infra/puppet-storyboard
1650 - openstack-infra/puppet-subunit2sql
1651 - openstack-infra/puppet-sudoers
1652 - openstack-infra/puppet-tmpreaper
1653 - openstack-infra/puppet-ulimit
1654 - openstack-infra/puppet-unattended_upgrades
1655 - openstack-infra/puppet-unbound
1656 - openstack-infra/puppet-user
1657 - openstack-infra/puppet-zanata
1658 - openstack-infra/puppet-zuul
1659 - openstack/puppet-openstack-integration
1660 - openstack-infra/system-config
1661
1662- job:
1664 name: legacy-puppet-openstackci-puppet-beaker-rspec 1663 name: legacy-puppet-openstackci-puppet-beaker-rspec
1665 parent: legacy-openstackci-base 1664 parent: legacy-openstackci-base
1666 run: playbooks/legacy/puppet-openstackci-puppet-beaker-rspec/run.yaml 1665 run: playbooks/legacy/puppet-openstackci-puppet-beaker-rspec/run.yaml
diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml
index 8523828..e47f379 100644
--- a/zuul.d/zuul-legacy-project-templates.yaml
+++ b/zuul.d/zuul-legacy-project-templates.yaml
@@ -41,31 +41,6 @@
41 branches: master 41 branches: master
42 42
43- project-template: 43- project-template:
44 name: infra-puppet-apply-jobs
45 check:
46 jobs:
47 - infra-puppet-apply-3-centos-7
48 - infra-puppet-apply-3-ubuntu-trusty:
49 branches: master
50 - infra-puppet-apply-3-ubuntu-xenial
51 - legacy-openstackci-beaker-centos-7
52 - legacy-openstackci-beaker-ubuntu-trusty
53 - legacy-openstackci-beaker:
54 voting: false
55 - infra-puppet-apply-4-centos-7
56 - infra-puppet-apply-4-ubuntu-xenial
57 gate:
58 jobs:
59 - infra-puppet-apply-3-centos-7
60 - infra-puppet-apply-3-ubuntu-trusty:
61 branches: master
62 - infra-puppet-apply-3-ubuntu-xenial
63 - legacy-openstackci-beaker-centos-7
64 - legacy-openstackci-beaker-ubuntu-trusty
65 - infra-puppet-apply-4-centos-7
66 - infra-puppet-apply-4-ubuntu-xenial
67
68- project-template:
69 name: infra-puppet-check-jobs 44 name: infra-puppet-check-jobs
70 check: 45 check:
71 jobs: 46 jobs: