diff --git a/playbooks/infra-puppet-apply/post.yaml b/playbooks/infra-puppet-apply/post.yaml new file mode 100644 index 00000000..4b2b5613 --- /dev/null +++ b/playbooks/infra-puppet-apply/post.yaml @@ -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 diff --git a/playbooks/infra-puppet-apply/pre.yaml b/playbooks/infra-puppet-apply/pre.yaml new file mode 100644 index 00000000..8a375158 --- /dev/null +++ b/playbooks/infra-puppet-apply/pre.yaml @@ -0,0 +1,4 @@ +- hosts: all + roles: + - role: bindep + bindep_profile: test diff --git a/playbooks/infra-puppet-apply/run.yaml b/playbooks/infra-puppet-apply/run.yaml new file mode 100644 index 00000000..ce120622 --- /dev/null +++ b/playbooks/infra-puppet-apply/run.yaml @@ -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 }}" diff --git a/playbooks/legacy/infra-puppet-apply-3-centos-7/post.yaml b/playbooks/legacy/infra-puppet-apply-3-centos-7/post.yaml deleted file mode 100644 index fb4c0c6f..00000000 --- a/playbooks/legacy/infra-puppet-apply-3-centos-7/post.yaml +++ /dev/null @@ -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 diff --git a/playbooks/legacy/infra-puppet-apply-3-centos-7/run.yaml b/playbooks/legacy/infra-puppet-apply-3-centos-7/run.yaml deleted file mode 100644 index aaf841e5..00000000 --- a/playbooks/legacy/infra-puppet-apply-3-centos-7/run.yaml +++ /dev/null @@ -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 }}' diff --git a/playbooks/legacy/infra-puppet-apply-3-ubuntu-trusty/post.yaml b/playbooks/legacy/infra-puppet-apply-3-ubuntu-trusty/post.yaml deleted file mode 100644 index fb4c0c6f..00000000 --- a/playbooks/legacy/infra-puppet-apply-3-ubuntu-trusty/post.yaml +++ /dev/null @@ -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 diff --git a/playbooks/legacy/infra-puppet-apply-3-ubuntu-trusty/run.yaml b/playbooks/legacy/infra-puppet-apply-3-ubuntu-trusty/run.yaml deleted file mode 100644 index e55b1017..00000000 --- a/playbooks/legacy/infra-puppet-apply-3-ubuntu-trusty/run.yaml +++ /dev/null @@ -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 }}' diff --git a/playbooks/legacy/infra-puppet-apply-3/post.yaml b/playbooks/legacy/infra-puppet-apply-3/post.yaml deleted file mode 100644 index fb4c0c6f..00000000 --- a/playbooks/legacy/infra-puppet-apply-3/post.yaml +++ /dev/null @@ -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 diff --git a/playbooks/legacy/infra-puppet-apply-3/run.yaml b/playbooks/legacy/infra-puppet-apply-3/run.yaml deleted file mode 100644 index c99cd7c8..00000000 --- a/playbooks/legacy/infra-puppet-apply-3/run.yaml +++ /dev/null @@ -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 }}' diff --git a/playbooks/legacy/infra-puppet-apply-4-centos-7/post.yaml b/playbooks/legacy/infra-puppet-apply-4-centos-7/post.yaml deleted file mode 100644 index fb4c0c6f..00000000 --- a/playbooks/legacy/infra-puppet-apply-4-centos-7/post.yaml +++ /dev/null @@ -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 diff --git a/playbooks/legacy/infra-puppet-apply-4-centos-7/run.yaml b/playbooks/legacy/infra-puppet-apply-4-centos-7/run.yaml deleted file mode 100644 index 7cfa0783..00000000 --- a/playbooks/legacy/infra-puppet-apply-4-centos-7/run.yaml +++ /dev/null @@ -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 }}' diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 5f39f053..d7b8da27 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -1108,6 +1108,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 diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index 8abe2898..88467e02 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -563,129 +563,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 diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml index fda1324c..dd21892f 100644 --- a/zuul.d/zuul-legacy-project-templates.yaml +++ b/zuul.d/zuul-legacy-project-templates.yaml @@ -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