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
This commit is contained in:
Colleen Murphy 2018-06-02 21:03:59 +02:00 committed by Colleen Murphy
parent d2dc5dd207
commit 0455113a07
8 changed files with 147 additions and 414 deletions

View File

@ -48,6 +48,6 @@
export BEAKER_debug=yes
export BEAKER_color=no
$GEM_HOME/bin/bundle exec rspec spec/acceptance
chdir: "{{ zuul.project.src_dir }}"
chdir: "{{ project_src_dir }}"
environment:
'GEM_HOME': "{{ ansible_user_dir }}/.bundled_gems"

View File

@ -1,95 +0,0 @@
- hosts: all
name: Autoconverted job legacy-openstackci-beaker-centos-7 from old job gate-openstackci-beaker-centos-7
tasks:
- name: Ensure legacy workspace directory
file:
path: '{{ ansible_user_dir }}/workspace'
state: directory
- shell:
cmd: |
/usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
git://git.openstack.org openstack-infra/puppet-openstackci
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
/usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
git://git.openstack.org openstack-infra/puppet-openstack_infra_spec_helper
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
if [ -f /usr/bin/yum ]; then
sudo yum -y remove rdo-release "centos-release-openstack-*" "centos-release-ceph-*"
sudo yum -y install libxml2-devel libxslt-devel ruby-devel zlib-devel
sudo yum -y groupinstall "Development Tools"
# Uninstall python-requests from pip, since we install it in
# system-config/install_puppet.sh
sudo pip uninstall requests -y || true
elif [ -f /usr/bin/apt-get ]; then
sudo apt-get update
sudo apt-get install -y libxml2-dev libxslt-dev ruby-dev zlib1g-dev
fi
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
echo "" | sudo tee -a /etc/ssh/sshd_config
echo "Match address 127.0.0.1" | sudo tee -a /etc/ssh/sshd_config
echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
echo "" | sudo tee -a /etc/ssh/sshd_config
echo "Match address ::1" | sudo tee -a /etc/ssh/sshd_config
echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
mkdir -p .ssh
ssh-keygen -f ~/.ssh/id_rsa -b 2048 -P ""
sudo mkdir -p /root/.ssh
cat ~/.ssh/id_rsa.pub | sudo tee -a /root/.ssh/authorized_keys
if [ -f /usr/bin/yum ]; then
sudo systemctl reload sshd
elif [ -f /usr/bin/apt-get ]; then
sudo service ssh restart
fi
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
sudo gem install bundler --no-rdoc --no-ri --verbose
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -x
sudo rm -f /etc/sudoers.d/zuul
# Prove that general sudo access is actually revoked
! sudo -n true
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
cd openstack-infra/puppet-openstackci
mkdir .bundled_gems
export GEM_HOME=`pwd`/.bundled_gems
bundle install
export BEAKER_set=nodepool-centos7
export BEAKER_debug=yes
export BEAKER_color=no
bundle exec rspec spec/acceptance
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'

View File

@ -1,95 +0,0 @@
- hosts: all
name: Autoconverted job legacy-openstackci-beaker-ubuntu-trusty from old job gate-openstackci-beaker-ubuntu-trusty
tasks:
- name: Ensure legacy workspace directory
file:
path: '{{ ansible_user_dir }}/workspace'
state: directory
- shell:
cmd: |
/usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
git://git.openstack.org openstack-infra/puppet-openstackci
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
/usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
git://git.openstack.org openstack-infra/puppet-openstack_infra_spec_helper
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
if [ -f /usr/bin/yum ]; then
sudo yum -y remove rdo-release "centos-release-openstack-*" "centos-release-ceph-*"
sudo yum -y install libxml2-devel libxslt-devel ruby-devel zlib-devel
sudo yum -y groupinstall "Development Tools"
# Uninstall python-requests from pip, since we install it in
# system-config/install_puppet.sh
sudo pip uninstall requests -y || true
elif [ -f /usr/bin/apt-get ]; then
sudo apt-get update
sudo apt-get install -y libxml2-dev libxslt-dev ruby-dev zlib1g-dev
fi
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
echo "" | sudo tee -a /etc/ssh/sshd_config
echo "Match address 127.0.0.1" | sudo tee -a /etc/ssh/sshd_config
echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
echo "" | sudo tee -a /etc/ssh/sshd_config
echo "Match address ::1" | sudo tee -a /etc/ssh/sshd_config
echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
mkdir -p .ssh
ssh-keygen -f ~/.ssh/id_rsa -b 2048 -P ""
sudo mkdir -p /root/.ssh
cat ~/.ssh/id_rsa.pub | sudo tee -a /root/.ssh/authorized_keys
if [ -f /usr/bin/yum ]; then
sudo systemctl reload sshd
elif [ -f /usr/bin/apt-get ]; then
sudo service ssh restart
fi
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
sudo gem install bundler --no-rdoc --no-ri --verbose
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -x
sudo rm -f /etc/sudoers.d/zuul
# Prove that general sudo access is actually revoked
! sudo -n true
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
cd openstack-infra/puppet-openstackci
mkdir .bundled_gems
export GEM_HOME=`pwd`/.bundled_gems
bundle install
export BEAKER_set=nodepool-trusty
export BEAKER_debug=yes
export BEAKER_color=no
bundle exec rspec spec/acceptance
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'

View File

@ -1,95 +0,0 @@
- hosts: all
name: Autoconverted job legacy-openstackci-beaker from old job gate-openstackci-beaker-ubuntu-xenial
tasks:
- name: Ensure legacy workspace directory
file:
path: '{{ ansible_user_dir }}/workspace'
state: directory
- shell:
cmd: |
/usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
git://git.openstack.org openstack-infra/puppet-openstackci
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
/usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
git://git.openstack.org openstack-infra/puppet-openstack_infra_spec_helper
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
if [ -f /usr/bin/yum ]; then
sudo yum -y remove rdo-release "centos-release-openstack-*" "centos-release-ceph-*"
sudo yum -y install libxml2-devel libxslt-devel ruby-devel zlib-devel
sudo yum -y groupinstall "Development Tools"
# Uninstall python-requests from pip, since we install it in
# system-config/install_puppet.sh
sudo pip uninstall requests -y || true
elif [ -f /usr/bin/apt-get ]; then
sudo apt-get update
sudo apt-get install -y libxml2-dev libxslt-dev ruby-dev zlib1g-dev
fi
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
echo "" | sudo tee -a /etc/ssh/sshd_config
echo "Match address 127.0.0.1" | sudo tee -a /etc/ssh/sshd_config
echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
echo "" | sudo tee -a /etc/ssh/sshd_config
echo "Match address ::1" | sudo tee -a /etc/ssh/sshd_config
echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
mkdir -p .ssh
ssh-keygen -f ~/.ssh/id_rsa -b 2048 -P ""
sudo mkdir -p /root/.ssh
cat ~/.ssh/id_rsa.pub | sudo tee -a /root/.ssh/authorized_keys
if [ -f /usr/bin/yum ]; then
sudo systemctl reload sshd
elif [ -f /usr/bin/apt-get ]; then
sudo service ssh restart
fi
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
sudo gem install bundler --no-rdoc --no-ri --verbose
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -x
sudo rm -f /etc/sudoers.d/zuul
# Prove that general sudo access is actually revoked
! sudo -n true
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
cd openstack-infra/puppet-openstackci
mkdir .bundled_gems
export GEM_HOME=`pwd`/.bundled_gems
bundle install
export BEAKER_set=nodepool-xenial
export BEAKER_debug=yes
export BEAKER_color=no
bundle exec rspec spec/acceptance
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'

View File

@ -1241,6 +1241,7 @@
run: playbooks/infra-puppet-beaker-rspec/run.yaml
vars:
nodeset: nodepool-xenial
project_src_dir: "{{ zuul.project.src_dir }}"
timeout: 3600
irrelevant-files:
- ^.*\.md$
@ -1336,6 +1337,26 @@
vars:
nodeset: nodepool-centos7
- job:
name: openstackci-beaker
parent: puppet-beaker-rspec-infra
vars:
project_src_dir: "{{ zuul.projects['git.openstack.org/openstack-infra/puppet-openstackci'].src_dir }}"
- job:
name: openstackci-beaker-centos-7
parent: openstackci-beaker
nodeset: centos-7
vars:
nodeset: nodepool-centos7
- job:
name: openstackci-beaker-ubuntu-trusty
parent: openstackci-beaker
nodeset: ubuntu-trusty
vars:
nodeset: nodepool-trusty
- job:
name: ansible-role-functional-base
abstract: true

View File

@ -1061,3 +1061,26 @@
gate:
jobs:
- puppet-beaker-rspec-centos-7-infra
- project-template:
name: infra-puppet-apply-jobs
check:
jobs:
- infra-puppet-apply-3-centos-7
- infra-puppet-apply-3-ubuntu-trusty:
branches: master
- infra-puppet-apply-3-ubuntu-xenial
- openstackci-beaker-centos-7
- openstackci-beaker-ubuntu-trusty
- openstackci-beaker:
voting: false
gate:
jobs:
- infra-puppet-apply-3-centos-7
- infra-puppet-apply-3-ubuntu-trusty:
branches: master
- infra-puppet-apply-3-ubuntu-xenial
- openstackci-beaker-centos-7
- openstackci-beaker-ubuntu-trusty
- infra-puppet-apply-4-centos-7
- infra-puppet-apply-4-ubuntu-xenial

View File

@ -1111,109 +1111,6 @@
- openstack/glance_store
- openstack/requirements
- job:
name: legacy-openstackci-base
parent: legacy-base
required-projects:
- openstack-infra/project-config
- openstack-infra/puppet-accessbot
- openstack-infra/puppet-ansible
- openstack-infra/puppet-askbot
- openstack-infra/puppet-asterisk
- openstack-infra/puppet-bandersnatch
- openstack-infra/puppet-bugdaystats
- openstack-infra/puppet-bup
- openstack-infra/puppet-cgit
- openstack-infra/puppet-diskimage_builder
- openstack-infra/puppet-drupal
- openstack-infra/puppet-elastic_recheck
- openstack-infra/puppet-elasticsearch
- openstack-infra/puppet-ethercalc
- openstack-infra/puppet-etherpad_lite
- openstack-infra/puppet-exim
- openstack-infra/puppet-germqtt
- openstack-infra/puppet-gerrit
- openstack-infra/puppet-gerritbot
- openstack-infra/puppet-github
- openstack-infra/puppet-grafyaml
- openstack-infra/puppet-graphite
- openstack-infra/puppet-haveged
- openstack-infra/puppet-hound
- openstack-infra/puppet-httpd
- openstack-infra/puppet-infracloud
- openstack-infra/puppet-iptables
- openstack-infra/puppet-jeepyb
- openstack-infra/puppet-jenkins
- openstack-infra/puppet-kerberos
- openstack-infra/puppet-kibana
- openstack-infra/puppet-lodgeit
- openstack-infra/puppet-log_processor
- openstack-infra/puppet-logrotate
- openstack-infra/puppet-logstash
- openstack-infra/puppet-lpmqtt
- openstack-infra/puppet-mailman
- openstack-infra/puppet-mediawiki
- openstack-infra/puppet-meetbot
- openstack-infra/puppet-mosquitto
- openstack-infra/puppet-mqtt_statsd
- openstack-infra/puppet-mysql_backup
- openstack-infra/puppet-nodepool
- openstack-infra/puppet-odsreg
- openstack-infra/puppet-openafs
- openstack-infra/puppet-openstackci
- openstack-infra/puppet-openstack_health
- openstack-infra/puppet-openstackid
- openstack-infra/puppet-openstack_infra_spec_helper
- openstack-infra/puppet-os_client_config
- openstack-infra/puppet-packagekit
- openstack-infra/puppet-pgsql_backup
- openstack-infra/puppet-phabricator
- openstack-infra/puppet-pip
- openstack-infra/puppet-planet
- openstack-infra/puppet-project_config
- openstack-infra/puppet-ptgbot
- openstack-infra/puppet-redis
- openstack-infra/puppet-refstack
- openstack-infra/puppet-reviewday
- openstack-infra/puppet-simpleproxy
- openstack-infra/puppet-snmpd
- openstack-infra/puppet-ssh
- openstack-infra/puppet-ssl_cert_check
- openstack-infra/puppet-stackalytics
- openstack-infra/puppet-statusbot
- openstack-infra/puppet-storyboard
- openstack-infra/puppet-subunit2sql
- openstack-infra/puppet-sudoers
- openstack-infra/puppet-tmpreaper
- openstack-infra/puppet-ulimit
- openstack-infra/puppet-unattended_upgrades
- openstack-infra/puppet-unbound
- openstack-infra/puppet-user
- openstack-infra/puppet-zanata
- openstack-infra/puppet-zuul
- openstack/puppet-openstack-integration
- openstack-infra/system-config
- job:
name: legacy-openstackci-beaker
parent: legacy-openstackci-base
run: playbooks/legacy/openstackci-beaker/run.yaml
timeout: 3600
- job:
name: legacy-openstackci-beaker-centos-7
parent: legacy-openstackci-base
run: playbooks/legacy/openstackci-beaker-centos-7/run.yaml
timeout: 3600
nodeset: legacy-centos-7
- job:
name: legacy-openstackci-beaker-ubuntu-trusty
parent: legacy-openstackci-base
run: playbooks/legacy/openstackci-beaker-ubuntu-trusty/run.yaml
timeout: 3600
nodeset: legacy-ubuntu-trusty
- job:
name: legacy-ospurge-dsvm-functional
parent: legacy-dsvm-base
@ -1660,6 +1557,108 @@
required-projects:
- openstack-infra/puppet-openstackci
- job:
name: legacy-openstackci-base
parent: legacy-base
required-projects:
- openstack-infra/project-config
- openstack-infra/puppet-accessbot
- openstack-infra/puppet-ansible
- openstack-infra/puppet-askbot
- openstack-infra/puppet-asterisk
- openstack-infra/puppet-bandersnatch
- openstack-infra/puppet-bugdaystats
- openstack-infra/puppet-bup
- openstack-infra/puppet-cgit
- openstack-infra/puppet-diskimage_builder
- openstack-infra/puppet-drupal
- openstack-infra/puppet-elastic_recheck
- openstack-infra/puppet-elasticsearch
- openstack-infra/puppet-ethercalc
- openstack-infra/puppet-etherpad_lite
- openstack-infra/puppet-exim
- openstack-infra/puppet-germqtt
- openstack-infra/puppet-gerrit
- openstack-infra/puppet-gerritbot
- openstack-infra/puppet-github
- openstack-infra/puppet-grafyaml
- openstack-infra/puppet-graphite
- openstack-infra/puppet-haveged
- openstack-infra/puppet-hound
- openstack-infra/puppet-httpd
- openstack-infra/puppet-bugdaystats
- openstack-infra/puppet-bup
- openstack-infra/puppet-cgit
- openstack-infra/puppet-diskimage_builder
- openstack-infra/puppet-drupal
- openstack-infra/puppet-elastic_recheck
- openstack-infra/puppet-elasticsearch
- openstack-infra/puppet-ethercalc
- openstack-infra/puppet-etherpad_lite
- openstack-infra/puppet-exim
- openstack-infra/puppet-germqtt
- openstack-infra/puppet-gerrit
- openstack-infra/puppet-gerritbot
- openstack-infra/puppet-github
- openstack-infra/puppet-grafyaml
- openstack-infra/puppet-graphite
- openstack-infra/puppet-haveged
- openstack-infra/puppet-hound
- openstack-infra/puppet-httpd
- openstack-infra/puppet-infracloud
- openstack-infra/puppet-iptables
- openstack-infra/puppet-jeepyb
- openstack-infra/puppet-jenkins
- openstack-infra/puppet-kerberos
- openstack-infra/puppet-kibana
- openstack-infra/puppet-lodgeit
- openstack-infra/puppet-log_processor
- openstack-infra/puppet-logrotate
- openstack-infra/puppet-logstash
- openstack-infra/puppet-lpmqtt
- openstack-infra/puppet-mailman
- openstack-infra/puppet-mediawiki
- openstack-infra/puppet-meetbot
- openstack-infra/puppet-mosquitto
- openstack-infra/puppet-mqtt_statsd
- openstack-infra/puppet-mysql_backup
- openstack-infra/puppet-nodepool
- openstack-infra/puppet-odsreg
- openstack-infra/puppet-openafs
- openstack-infra/puppet-openstackci
- openstack-infra/puppet-openstack_health
- openstack-infra/puppet-openstackid
- openstack-infra/puppet-openstack_infra_spec_helper
- openstack-infra/puppet-os_client_config
- openstack-infra/puppet-packagekit
- openstack-infra/puppet-pgsql_backup
- openstack-infra/puppet-phabricator
- openstack-infra/puppet-pip
- openstack-infra/puppet-planet
- openstack-infra/puppet-project_config
- openstack-infra/puppet-ptgbot
- openstack-infra/puppet-redis
- openstack-infra/puppet-refstack
- openstack-infra/puppet-reviewday
- openstack-infra/puppet-simpleproxy
- openstack-infra/puppet-snmpd
- openstack-infra/puppet-ssh
- openstack-infra/puppet-ssl_cert_check
- openstack-infra/puppet-stackalytics
- openstack-infra/puppet-statusbot
- openstack-infra/puppet-storyboard
- openstack-infra/puppet-subunit2sql
- openstack-infra/puppet-sudoers
- openstack-infra/puppet-tmpreaper
- openstack-infra/puppet-ulimit
- openstack-infra/puppet-unattended_upgrades
- openstack-infra/puppet-unbound
- openstack-infra/puppet-user
- openstack-infra/puppet-zanata
- openstack-infra/puppet-zuul
- openstack/puppet-openstack-integration
- openstack-infra/system-config
- job:
name: legacy-puppet-openstackci-puppet-beaker-rspec
parent: legacy-openstackci-base

View File

@ -40,31 +40,6 @@
- legacy-logstash-filters-ubuntu-trusty:
branches: master
- project-template:
name: infra-puppet-apply-jobs
check:
jobs:
- infra-puppet-apply-3-centos-7
- infra-puppet-apply-3-ubuntu-trusty:
branches: master
- infra-puppet-apply-3-ubuntu-xenial
- legacy-openstackci-beaker-centos-7
- legacy-openstackci-beaker-ubuntu-trusty
- legacy-openstackci-beaker:
voting: false
- infra-puppet-apply-4-centos-7
- infra-puppet-apply-4-ubuntu-xenial
gate:
jobs:
- infra-puppet-apply-3-centos-7
- infra-puppet-apply-3-ubuntu-trusty:
branches: master
- infra-puppet-apply-3-ubuntu-xenial
- legacy-openstackci-beaker-centos-7
- legacy-openstackci-beaker-ubuntu-trusty
- infra-puppet-apply-4-centos-7
- infra-puppet-apply-4-ubuntu-xenial
- project-template:
name: infra-puppet-check-jobs
check: