From 13ef0adb415e6296fe5c73d9ff9d1ca557843c54 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sat, 18 Apr 2020 09:18:47 -0500 Subject: [PATCH] Remove legacy infra puppet apply jobs These moved to system-config so that unwinding them can be more self-contained. Remove them. Depends-On: https://review.opendev.org/720889 Change-Id: Id0959976b2a6e51e3d62f851bc5866f8980e8269 --- playbooks/infra-puppet-apply/post.yaml | 7 - playbooks/infra-puppet-apply/pre.yaml | 4 - playbooks/infra-puppet-apply/run.yaml | 12 - playbooks/infra-puppet-beaker-rspec/run.yaml | 54 ----- playbooks/legacy/logstash-filters/post.yaml | 15 -- playbooks/legacy/logstash-filters/run.yaml | 28 --- zuul.d/jobs.yaml | 227 ------------------- zuul.d/project-templates.yaml | 47 ---- zuul.d/zuul-legacy-jobs.yaml | 84 ------- zuul.d/zuul-legacy-project-templates.yaml | 9 - 10 files changed, 487 deletions(-) delete mode 100644 playbooks/infra-puppet-apply/post.yaml delete mode 100644 playbooks/infra-puppet-apply/pre.yaml delete mode 100644 playbooks/infra-puppet-apply/run.yaml delete mode 100644 playbooks/infra-puppet-beaker-rspec/run.yaml delete mode 100644 playbooks/legacy/logstash-filters/post.yaml delete mode 100644 playbooks/legacy/logstash-filters/run.yaml diff --git a/playbooks/infra-puppet-apply/post.yaml b/playbooks/infra-puppet-apply/post.yaml deleted file mode 100644 index 00b142dc..00000000 --- a/playbooks/infra-puppet-apply/post.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- hosts: all - tasks: - - name: Copy puppet-apply test output to log server - synchronize: - src: "{{ zuul.projects['opendev.org/opendev/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 deleted file mode 100644 index 8a375158..00000000 --- a/playbooks/infra-puppet-apply/pre.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: bindep - bindep_profile: test diff --git a/playbooks/infra-puppet-apply/run.yaml b/playbooks/infra-puppet-apply/run.yaml deleted file mode 100644 index 874924dd..00000000 --- a/playbooks/infra-puppet-apply/run.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- hosts: all - name: infra-puppet-apply - tasks: - - - name: Run puppet-apply test - shell: ./tools/apply-test.sh - args: - chdir: "{{ zuul.projects['opendev.org/opendev/system-config'].src_dir }}" - environment: - PUPPET_VERSION: "{{ puppet_version | default('4') }}" - tags: - - skip_ansible_lint diff --git a/playbooks/infra-puppet-beaker-rspec/run.yaml b/playbooks/infra-puppet-beaker-rspec/run.yaml deleted file mode 100644 index 5d9adb03..00000000 --- a/playbooks/infra-puppet-beaker-rspec/run.yaml +++ /dev/null @@ -1,54 +0,0 @@ -- hosts: all - name: Beaker-rspec functional testing for Infra puppet modules - roles: - - bindep - - tasks: - - - name: Set up SSH for beaker - 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 - - - name: Create local gems directory - file: - state: directory - path: '{{ ansible_user_dir }}/.bundled_gems' - - - name: Install ruby dependencies - become: yes - shell: - cmd: | - if [ -f /usr/bin/yum ]; then - yum install ruby-devel gcc-c++ -y - elif [ -f /usr/bin/apt-get ]; then - apt-get install ruby-dev -y - fi - - - name: Execute acceptance tests - shell: - cmd: | - gem install bundler --no-ri --no-rdoc --verbose --version '<2.0.0' - $GEM_HOME/bin/bundle install --retry 3 - export BEAKER_set={{ nodeset }} - export BEAKER_debug=yes - export BEAKER_color=no - $GEM_HOME/bin/bundle exec rspec spec/acceptance - chdir: "{{ project_src_dir }}" - environment: - 'GEM_HOME': "{{ ansible_user_dir }}/.bundled_gems" - 'PUPPET_VERSION': "{{ puppet_version | default('4') }}" diff --git a/playbooks/legacy/logstash-filters/post.yaml b/playbooks/legacy/logstash-filters/post.yaml deleted file mode 100644 index 2ac6b41d..00000000 --- a/playbooks/legacy/logstash-filters/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=/opendev/system-config/applytest/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/logstash-filters/run.yaml b/playbooks/legacy/logstash-filters/run.yaml deleted file mode 100644 index 0f22ecac..00000000 --- a/playbooks/legacy/logstash-filters/run.yaml +++ /dev/null @@ -1,28 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-logstash-filters from old job gate-logstash-filters-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 \ - https://opendev.org opendev/system-config - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cd opendev/system-config - ./tools/logstash-filter-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 e3248418..ed40a9b9 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -1063,233 +1063,6 @@ tox_environment: ANSIBLE_ROLES_PATH: ~/src/opendev.org/opendev/base-jobs/roles:~/src/opendev.org/zuul/zuul-jobs/roles:~/src/opendev.org/openstack/openstack-zuul-jobs/roles:~/src/opendev.org/openstack/project-config/roles:~/src/opendev.org/opendev/system-config/roles -- job: - name: infra-puppet-apply-base - # Required to install z-c for puppet module installs. - parent: legacy-base - timeout: 1800 - required-projects: - - opendev/system-config - - opendev/ansible-role-puppet - - opendev/puppet-accessbot - - opendev/puppet-ansible - - opendev/puppet-apparmor - - opendev/puppet-askbot - - opendev/puppet-asterisk - - opendev/puppet-bandersnatch - - opendev/puppet-bugdaystats - - opendev/puppet-bup - - opendev/puppet-cgit - - opendev/puppet-ciwatch - - opendev/puppet-diskimage_builder - - opendev/puppet-drupal - - opendev/puppet-elastic_recheck - - opendev/puppet-elasticsearch - - opendev/puppet-ethercalc - - opendev/puppet-etherpad_lite - - opendev/puppet-exim - - opendev/puppet-germqtt - - opendev/puppet-gerrit - - opendev/puppet-gerritbot - - opendev/puppet-github - - opendev/puppet-grafyaml - - opendev/puppet-graphite - - opendev/puppet-haveged - - opendev/puppet-hound - - opendev/puppet-httpd - - opendev/puppet-infracloud - - opendev/puppet-infra-cookiecutter - - opendev/puppet-ipsilon - - opendev/puppet-iptables - - opendev/puppet-jeepyb - - opendev/puppet-jenkins - - opendev/puppet-kerberos - - opendev/puppet-kibana - - opendev/puppet-lodgeit - - opendev/puppet-log_processor - - opendev/puppet-logrotate - - opendev/puppet-logstash - - opendev/puppet-lpmqtt - - opendev/puppet-mailman - - opendev/puppet-mediawiki - - opendev/puppet-meetbot - - opendev/puppet-mosquitto - - opendev/puppet-mqtt_statsd - - opendev/puppet-mysql_backup - - opendev/puppet-nodepool - - opendev/puppet-openafs - - opendev/puppet-openstackci - - opendev/puppet-openstack_health - - opendev/puppet-openstackid - - opendev/puppet-openstack_infra_spec_helper - - opendev/puppet-os_client_config - - opendev/puppet-packagekit - - opendev/puppet-pgsql_backup - - opendev/puppet-phabricator - - opendev/puppet-pip - - opendev/puppet-planet - - opendev/puppet-project_config - - opendev/puppet-ptgbot - - opendev/puppet-puppet - - opendev/puppet-redis - - opendev/puppet-refstack - - opendev/puppet-reviewday - - opendev/puppet-simpleproxy - - opendev/puppet-snmpd - - opendev/puppet-ssh - - opendev/puppet-ssl_cert_check - - opendev/puppet-statusbot - - opendev/puppet-storyboard - - opendev/puppet-subunit2sql - - opendev/puppet-sudoers - - opendev/puppet-tmpreaper - - opendev/puppet-translation_checksite - - opendev/puppet-ulimit - - opendev/puppet-unattended_upgrades - - opendev/puppet-unbound - - opendev/puppet-user - - opendev/puppet-vcsrepo - - opendev/puppet-zanata - - opendev/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 - irrelevant-files: - - docker/.* - - playbooks/.* - -- job: - name: infra-puppet-apply-4-ubuntu-xenial - parent: infra-puppet-apply-base - nodeset: ubuntu-xenial - vars: - puppet_version: 4 - -- job: - name: puppet-beaker-rspec-infra - parent: legacy-base - description: | - Base job for beaker-rspec tests for Infra's puppet modules. - nodeset: devstack-single-node - run: playbooks/infra-puppet-beaker-rspec/run.yaml - vars: - nodeset: nodepool-xenial - project_src_dir: "{{ zuul.project.src_dir }}" - timeout: 3600 - irrelevant-files: - - ^.*\.md$ - - ^.*\.rst$ - - ^doc/.*$ - - ^etc/.*$ - - ^metadata.json$ - - ^releasenotes/.*$ - - ^test-requirements.txt$ - required-projects: - - openstack/project-config - - opendev/system-config - - opendev/puppet-openstack_infra_spec_helper - - opendev/puppet-bugdaystats - - opendev/puppet-mysql_backup - - opendev/puppet-openstackci - - opendev/puppet-zuul - - opendev/puppet-mqtt_statsd - - opendev/puppet-meetbot - - opendev/puppet-hound - - opendev/puppet-pip - - opendev/puppet-os_client_config - - opendev/puppet-openstackid - - opendev/puppet-bandersnatch - - opendev/puppet-project_config - - opendev/puppet-grafyaml - - opendev/puppet-refstack - - opendev/puppet-github - - opendev/puppet-ethercalc - - opendev/puppet-unattended_upgrades - - opendev/puppet-openafs - - opendev/puppet-httpd - - opendev/puppet-drupal - - opendev/puppet-subunit2sql - - opendev/puppet-reviewday - - opendev/puppet-kibana - - opendev/puppet-redis - - opendev/puppet-phabricator - - opendev/puppet-ssl_cert_check - - opendev/puppet-lpmqtt - - opendev/puppet-germqtt - - opendev/puppet-cgit - - opendev/puppet-packagekit - - opendev/puppet-haveged - - opendev/puppet-graphite - - opendev/puppet-diskimage_builder - - opendev/puppet-sudoers - - opendev/puppet-zanata - - opendev/puppet-logstash - - opendev/puppet-gerritbot - - opendev/puppet-asterisk - - opendev/puppet-statusbot - - opendev/puppet-gerrit - - opendev/puppet-mediawiki - - opendev/puppet-mailman - - opendev/puppet-exim - - opendev/puppet-tmpreaper - - opendev/puppet-elastic_recheck - - opendev/puppet-ulimit - - opendev/puppet-planet - - opendev/puppet-nodepool - - opendev/puppet-logrotate - - opendev/puppet-infracloud - - opendev/puppet-elasticsearch - - opendev/puppet-unbound - - opendev/puppet-storyboard - - opendev/puppet-openstack_health - - opendev/puppet-kerberos - - opendev/puppet-askbot - - opendev/puppet-log_processor - - opendev/puppet-simpleproxy - - opendev/puppet-iptables - - opendev/puppet-lodgeit - - opendev/puppet-etherpad_lite - - opendev/puppet-mosquitto - - opendev/puppet-bup - - opendev/puppet-pgsql_backup - - opendev/puppet-ansible - - opendev/puppet-ssh - - opendev/puppet-snmpd - - opendev/puppet-user - - opendev/puppet-jeepyb - - opendev/puppet-accessbot - - opendev/puppet-ptgbot - - opendev/puppet-jenkins - - opendev/puppet-vcsrepo - -- job: - name: puppet-beaker-rspec-puppet-4-infra - parent: puppet-beaker-rspec-infra - description: | - Run beaker-rspec functional tests with puppet 4 on Ubuntu Xenial. - vars: - puppet_version: 4 - -- job: - name: puppet-beaker-rspec-puppet-4-centos-7-infra - parent: puppet-beaker-rspec-infra - nodeset: centos-7 - description: | - Run beaker-rspec functional tests with puppet 4 on CentOS 7. - vars: - nodeset: nodepool-centos7 - puppet_version: 4 - -- job: - name: openstackci-beaker-puppet-4 - parent: puppet-beaker-rspec-infra - description: | - Run beaker-rspec functional tests with puppet 4 on Ubuntu Xenial for the - puppet-openstackci module. - vars: - project_src_dir: "{{ zuul.projects['opendev.org/opendev/puppet-openstackci'].src_dir }}" - puppet_version: 4 - - job: name: ansible-role-functional-base abstract: true diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index b0118d42..4e7b33ec 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -1853,53 +1853,6 @@ - golang-fmt - golang-unit -- project-template: - name: puppet-beaker-jobs-xenial-infra - description: | - Runs puppet beaker tests for OpenStack Infrastructure. - The jobs are run on Ubuntu Xenial. - check: - jobs: - - puppet-beaker-rspec-puppet-4-infra - gate: - jobs: - - puppet-beaker-rspec-puppet-4-infra - -- project-template: - name: puppet-beaker-jobs-xenial-infra-nv - description: | - Runs puppet beaker tests for OpenStack Infrastructure. - The jobs are run on Ubuntu Xenial and are non-voting. - check: - jobs: - - puppet-beaker-rspec-puppet-4-infra: - voting: false - -- project-template: - name: puppet-beaker-jobs-centos-7-infra - description: | - Runs puppet beaker tests for OpenStack Infrastructure. - The jobs are run on CentOS 7. - check: - jobs: - - puppet-beaker-rspec-puppet-4-centos-7-infra - gate: - jobs: - - puppet-beaker-rspec-puppet-4-centos-7-infra - -- project-template: - name: infra-puppet-apply-jobs - description: | - Runs puppet apply tests for OpenStack Infrastructure. - check: - jobs: - - infra-puppet-apply-4-ubuntu-xenial - - openstackci-beaker-puppet-4 - gate: - jobs: - - infra-puppet-apply-4-ubuntu-xenial - - openstackci-beaker-puppet-4 - - project-template: name: lib-forward-testing description: | diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index 139d92b6..8cfa95ae 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -227,90 +227,6 @@ - openstack/devstack-gate - x/kingbird -- job: - name: legacy-logstash-filters - parent: legacy-base - required-projects: - - opendev/ansible-role-puppet - - openstack/logstash-filters - - opendev/puppet-accessbot - - opendev/puppet-ansible - - opendev/puppet-askbot - - opendev/puppet-asterisk - - opendev/puppet-bandersnatch - - opendev/puppet-bugdaystats - - opendev/puppet-bup - - opendev/puppet-cgit - - opendev/puppet-diskimage_builder - - opendev/puppet-drupal - - opendev/puppet-elastic_recheck - - opendev/puppet-elasticsearch - - opendev/puppet-ethercalc - - opendev/puppet-etherpad_lite - - opendev/puppet-exim - - opendev/puppet-germqtt - - opendev/puppet-gerrit - - opendev/puppet-gerritbot - - opendev/puppet-github - - opendev/puppet-grafyaml - - opendev/puppet-graphite - - opendev/puppet-haveged - - opendev/puppet-hound - - opendev/puppet-httpd - - opendev/puppet-infracloud - - opendev/puppet-iptables - - opendev/puppet-jeepyb - - opendev/puppet-jenkins - - opendev/puppet-kerberos - - opendev/puppet-kibana - - opendev/puppet-lodgeit - - opendev/puppet-log_processor - - opendev/puppet-logrotate - - opendev/puppet-logstash - - opendev/puppet-lpmqtt - - opendev/puppet-mailman - - opendev/puppet-mediawiki - - opendev/puppet-meetbot - - opendev/puppet-mosquitto - - opendev/puppet-mqtt_statsd - - opendev/puppet-mysql_backup - - opendev/puppet-nodepool - - opendev/puppet-openafs - - opendev/puppet-openstackci - - opendev/puppet-openstack_health - - opendev/puppet-openstackid - - opendev/puppet-os_client_config - - opendev/puppet-packagekit - - opendev/puppet-pgsql_backup - - opendev/puppet-phabricator - - opendev/puppet-pip - - opendev/puppet-planet - - opendev/puppet-project_config - - opendev/puppet-ptgbot - - opendev/puppet-redis - - opendev/puppet-refstack - - opendev/puppet-reviewday - - opendev/puppet-simpleproxy - - opendev/puppet-snmpd - - opendev/puppet-ssh - - opendev/puppet-ssl_cert_check - - opendev/puppet-statusbot - - opendev/puppet-storyboard - - opendev/puppet-subunit2sql - - opendev/puppet-sudoers - - opendev/puppet-tmpreaper - - opendev/puppet-ulimit - - opendev/puppet-unattended_upgrades - - opendev/puppet-unbound - - opendev/puppet-user - - opendev/puppet-vcsrepo - - opendev/puppet-zanata - - opendev/puppet-zuul - - opendev/system-config - run: playbooks/legacy/logstash-filters/run.yaml - post-run: playbooks/legacy/logstash-filters/post.yaml - timeout: 1800 - nodeset: ubuntu-xenial - job: name: legacy-monasca-api-localrepo-upload diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml index 0ebbeafb..613d2b87 100644 --- a/zuul.d/zuul-legacy-project-templates.yaml +++ b/zuul.d/zuul-legacy-project-templates.yaml @@ -1,12 +1,3 @@ -- project-template: - name: infra-logstash-filter-jobs - check: - jobs: - - legacy-logstash-filters - gate: - jobs: - - legacy-logstash-filters - - project-template: name: infra-puppet-check-jobs check: