openstack/openstack-zuul-jobs
Code Issues Proposed changes

Merge "Convert infra-puppet-apply jobs to non-legacy"

Browse Source
This commit is contained in:
Zuul 2018-04-12 19:45:57 +00:00 committed by Gerrit Code Review
commit c5f01f68e4
14 changed files with 143 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playbooks/infra-puppet-apply/post.yaml Normal file
View File

@ -0,0 +1,7 @@
- hosts: all
tasks:
- name: Copy puppet-apply test output to log server
synchronize:
src: "{{ zuul.projects['git.openstack.org/openstack-infra/system-config'].src_dir }}/applytest/"
dest: '{{ zuul.executor.log_root }}/applytest/'
mode: pull

4
playbooks/infra-puppet-apply/pre.yaml Normal file
View File

@ -0,0 +1,4 @@
- hosts: all
roles:
- role: bindep
bindep_profile: test

8
playbooks/infra-puppet-apply/run.yaml Normal file
View File

@ -0,0 +1,8 @@
- hosts: all
name: infra-puppet-apply-3
tasks:
- name: Run puppet-apply test
command: ./tools/apply-test.sh
args:
chdir: "{{ zuul.projects['git.openstack.org/openstack-infra/system-config'].src_dir }}"

15
playbooks/legacy/infra-puppet-apply-3-centos-7/post.yaml
View File

@ -1,15 +0,0 @@
- hosts: primary
tasks:
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
synchronize:
src: '{{ ansible_user_dir }}/workspace/'
dest: '{{ zuul.executor.log_root }}'
mode: pull
copy_links: true
verify_host: true
rsync_opts:
- --include=/openstack-infra/system-config/applytest/**
- --include=*/
- --exclude=*
- --prune-empty-dirs

33
playbooks/legacy/infra-puppet-apply-3-centos-7/run.yaml
View File

@ -1,33 +0,0 @@
- hosts: all
name: Autoconverted job legacy-infra-puppet-apply-3-centos-7 from old job gate-infra-puppet-apply-3-centos-7
tasks:
- name: Ensure legacy workspace directory
file:
path: '{{ ansible_user_dir }}/workspace'
state: directory
- shell:
cmd: |
set -e
set -x
/usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
git://git.openstack.org openstack-infra/system-config
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
cd openstack-infra/system-config
/usr/local/jenkins/slave_scripts/install-distro-packages.sh
if [ "3" == "4" ]; then
# TODO:
echo "TODO: add logic to deploy puppet4"
fi
./tools/apply-test.sh
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'

15
playbooks/legacy/infra-puppet-apply-3-ubuntu-trusty/post.yaml
View File

@ -1,15 +0,0 @@
- hosts: primary
tasks:
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
synchronize:
src: '{{ ansible_user_dir }}/workspace/'
dest: '{{ zuul.executor.log_root }}'
mode: pull
copy_links: true
verify_host: true
rsync_opts:
- --include=/openstack-infra/system-config/applytest/**
- --include=*/
- --exclude=*
- --prune-empty-dirs

33
playbooks/legacy/infra-puppet-apply-3-ubuntu-trusty/run.yaml
View File

@ -1,33 +0,0 @@
- hosts: all
name: Autoconverted job legacy-infra-puppet-apply-3-ubuntu-trusty from old job gate-infra-puppet-apply-3-ubuntu-trusty
tasks:
- name: Ensure legacy workspace directory
file:
path: '{{ ansible_user_dir }}/workspace'
state: directory
- shell:
cmd: |
set -e
set -x
/usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
git://git.openstack.org openstack-infra/system-config
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
cd openstack-infra/system-config
/usr/local/jenkins/slave_scripts/install-distro-packages.sh
if [ "3" == "4" ]; then
# TODO:
echo "TODO: add logic to deploy puppet4"
fi
./tools/apply-test.sh
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'

15
playbooks/legacy/infra-puppet-apply-3/post.yaml
View File

@ -1,15 +0,0 @@
- hosts: primary
tasks:
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
synchronize:
src: '{{ ansible_user_dir }}/workspace/'
dest: '{{ zuul.executor.log_root }}'
mode: pull
copy_links: true
verify_host: true
rsync_opts:
- --include=/openstack-infra/system-config/applytest/**
- --include=*/
- --exclude=*
- --prune-empty-dirs

33
playbooks/legacy/infra-puppet-apply-3/run.yaml
View File

@ -1,33 +0,0 @@
- hosts: all
name: Autoconverted job legacy-infra-puppet-apply-3 from old job gate-infra-puppet-apply-3-ubuntu-xenial
tasks:
- name: Ensure legacy workspace directory
file:
path: '{{ ansible_user_dir }}/workspace'
state: directory
- shell:
cmd: |
set -e
set -x
/usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
git://git.openstack.org openstack-infra/system-config
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
cd openstack-infra/system-config
/usr/local/jenkins/slave_scripts/install-distro-packages.sh
if [ "3" == "4" ]; then
# TODO:
echo "TODO: add logic to deploy puppet4"
fi
./tools/apply-test.sh
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'

15
playbooks/legacy/infra-puppet-apply-4-centos-7/post.yaml
View File

@ -1,15 +0,0 @@
- hosts: primary
tasks:
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
synchronize:
src: '{{ ansible_user_dir }}/workspace/'
dest: '{{ zuul.executor.log_root }}'
mode: pull
copy_links: true
verify_host: true
rsync_opts:
- --include=/openstack-infra/system-config/applytest/**
- --include=*/
- --exclude=*
- --prune-empty-dirs

33
playbooks/legacy/infra-puppet-apply-4-centos-7/run.yaml
View File

@ -1,33 +0,0 @@
- hosts: all
name: Autoconverted job legacy-infra-puppet-apply-4-centos-7 from old job gate-infra-puppet-apply-4-centos-7
tasks:
- name: Ensure legacy workspace directory
file:
path: '{{ ansible_user_dir }}/workspace'
state: directory
- shell:
cmd: |
set -e
set -x
/usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
git://git.openstack.org openstack-infra/system-config
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
cd openstack-infra/system-config
/usr/local/jenkins/slave_scripts/install-distro-packages.sh
if [ "4" == "4" ]; then
# TODO:
echo "TODO: add logic to deploy puppet4"
fi
./tools/apply-test.sh
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'

117
zuul.d/jobs.yaml
View File

@ -1087,6 +1087,123 @@
tox_environment:
ANSIBLE_ROLES_PATH: ~/src/git.openstack.org/openstack-infra/zuul-jobs/roles:~/src/git.openstack.org/openstack-infra/openstack-zuul-jobs/roles:~/src/git.openstack.org/openstack-infra/project-config/roles
- job:
name: infra-puppet-apply-base
timeout: 1800
required-projects:
- openstack-infra/system-config
- openstack-infra/ansible-role-puppet
- openstack-infra/puppet-accessbot
- openstack-infra/puppet-ansible
- openstack-infra/puppet-apparmor
- 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-ciwatch
- openstack-infra/puppet-diskimage_builder
- openstack-infra/puppet-docker_registry
- 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-featuretracker
- 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-infra-cookiecutter
- openstack-infra/puppet-ipsilon
- 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-puppet
- openstack-infra/puppet-redis
- openstack-infra/puppet-refstack
- openstack-infra/puppet-releasestatus
- 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-translation_checksite
- openstack-infra/puppet-ulimit
- openstack-infra/puppet-unattended_upgrades
- openstack-infra/puppet-unbound
- openstack-infra/puppet-user
- openstack-infra/puppet-vcsrepo
- openstack-infra/puppet-vinz
- openstack-infra/puppet-yum
- openstack-infra/puppet-zanata
- openstack-infra/puppet-zuul
pre-run: playbooks/infra-puppet-apply/pre.yaml
run: playbooks/infra-puppet-apply/run.yaml
post-run: playbooks/infra-puppet-apply/post.yaml
- job:
name: infra-puppet-apply-3-ubuntu-xenial
parent: infra-puppet-apply-base
- job:
name: infra-puppet-apply-3-centos-7
parent: infra-puppet-apply-base
nodeset: centos-7
- job:
name: infra-puppet-apply-3-ubuntu-trusty
parent: infra-puppet-apply-base
nodeset: ubuntu-trusty
branches: master
- job:
name: infra-puppet-apply-4-centos-7
parent: infra-puppet-apply-base
nodeset: centos-7
- job:
name: ansible-role-functional-base
abstract: true

123
zuul.d/zuul-legacy-jobs.yaml
View File

@ -548,129 +548,6 @@
run: playbooks/legacy/hacking-integration-nova/run.yaml
timeout: 1800
- job:
name: legacy-infra-puppet-apply-base
parent: legacy-base
timeout: 1800
required-projects:
- openstack-infra/system-config
- openstack-infra/ansible-role-puppet
- openstack-infra/puppet-accessbot
- openstack-infra/puppet-ansible
- openstack-infra/puppet-apparmor
- 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-ciwatch
- openstack-infra/puppet-diskimage_builder
- openstack-infra/puppet-docker_registry
- 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-featuretracker
- 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-infra-cookiecutter
- openstack-infra/puppet-ipsilon
- 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-puppet
- openstack-infra/puppet-redis
- openstack-infra/puppet-refstack
- openstack-infra/puppet-releasestatus
- 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-translation_checksite
- openstack-infra/puppet-ulimit
- openstack-infra/puppet-unattended_upgrades
- openstack-infra/puppet-unbound
- openstack-infra/puppet-user
- openstack-infra/puppet-vcsrepo
- openstack-infra/puppet-vinz
- openstack-infra/puppet-yum
- openstack-infra/puppet-zanata
- openstack-infra/puppet-zuul
- job:
name: legacy-infra-puppet-apply-3
parent: legacy-infra-puppet-apply-base
run: playbooks/legacy/infra-puppet-apply-3/run.yaml
post-run: playbooks/legacy/infra-puppet-apply-3/post.yaml
- job:
name: legacy-infra-puppet-apply-3-centos-7
parent: legacy-infra-puppet-apply-base
run: playbooks/legacy/infra-puppet-apply-3-centos-7/run.yaml
post-run: playbooks/legacy/infra-puppet-apply-3-centos-7/post.yaml
nodeset: legacy-centos-7
- job:
name: legacy-infra-puppet-apply-3-ubuntu-trusty
parent: legacy-infra-puppet-apply-base
run: playbooks/legacy/infra-puppet-apply-3-ubuntu-trusty/run.yaml
post-run: playbooks/legacy/infra-puppet-apply-3-ubuntu-trusty/post.yaml
nodeset: legacy-ubuntu-trusty
branches: master
- job:
name: legacy-infra-puppet-apply-4-centos-7
parent: legacy-infra-puppet-apply-base
run: playbooks/legacy/infra-puppet-apply-4-centos-7/run.yaml
post-run: playbooks/legacy/infra-puppet-apply-4-centos-7/post.yaml
nodeset: legacy-centos-7
- job:
name: legacy-install-dsvm-dragonflow-kuryr-kubernetes
parent: legacy-dsvm-base

14
zuul.d/zuul-legacy-project-templates.yaml
View File

@ -44,25 +44,25 @@
name: infra-puppet-apply-jobs
check:
jobs:
- legacy-infra-puppet-apply-3-centos-7
- legacy-infra-puppet-apply-3-ubuntu-trusty:
- infra-puppet-apply-3-centos-7
- infra-puppet-apply-3-ubuntu-trusty:
branches: master
- legacy-infra-puppet-apply-3
- infra-puppet-apply-3-ubuntu-xenial
- legacy-openstackci-beaker-centos-7
- legacy-openstackci-beaker-ubuntu-trusty
- legacy-openstackci-beaker:
voting: false
gate:
jobs:
- legacy-infra-puppet-apply-3-centos-7
- legacy-infra-puppet-apply-3-ubuntu-trusty:
- infra-puppet-apply-3-centos-7
- infra-puppet-apply-3-ubuntu-trusty:
branches: master
- legacy-infra-puppet-apply-3
- infra-puppet-apply-3-ubuntu-xenial
- legacy-openstackci-beaker-centos-7
- legacy-openstackci-beaker-ubuntu-trusty
experimental:
jobs:
- legacy-infra-puppet-apply-4-centos-7
- infra-puppet-apply-4-centos-7
- project-template:
name: infra-puppet-check-jobs