From 9ec0fa8ca54e57be022b252d4fe008efd454b6b2 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 4 Mar 2024 10:18:15 -0800 Subject: [PATCH] Cleanup legacy CentOS 7 jobs and nodesets We are starting work to remove CentOS 7 from Zuul and Nodepool. The first step there is to delete everything that appears to be unused. We do that here cleaning up nodesets and jobs that should be unused at this point in time. Note we keep the wheel cache/mirror build and publication jobs around for just a bit longer. We will clean those up when we are closer to being able to remove everything CentOS 7 related. Depends-On: https://review.opendev.org/c/openstack/project-config/+/910978 Change-Id: I984c494afc5ba58b50350bc9eae58260cc66f2ee --- .../run.yaml | 83 ------------------- .../run.yaml | 83 ------------------- .../post.yaml | 15 ---- .../run.yaml | 57 ------------- zuul.d/nodesets.yaml | 18 ---- zuul.d/project-templates.yaml | 12 --- zuul.d/zuul-legacy-jobs.yaml | 26 ------ zuul.d/zuul-legacy-project-templates.yaml | 10 --- 8 files changed, 304 deletions(-) delete mode 100644 playbooks/legacy/puppet-midonet-puppet-unit-4.5-centos-7/run.yaml delete mode 100644 playbooks/legacy/puppet-midonet-puppet-unit-latest-centos-7/run.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-neutron-full-centos-7/post.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-neutron-full-centos-7/run.yaml diff --git a/playbooks/legacy/puppet-midonet-puppet-unit-4.5-centos-7/run.yaml b/playbooks/legacy/puppet-midonet-puppet-unit-4.5-centos-7/run.yaml deleted file mode 100644 index ffe848de..00000000 --- a/playbooks/legacy/puppet-midonet-puppet-unit-4.5-centos-7/run.yaml +++ /dev/null @@ -1,83 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-puppet-midonet-puppet-unit-4.5-centos-7 from old - job gate-puppet-midonet-puppet-unit-4.5-centos-7 - roles: - - bindep - - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - # In cases where zuul-cloner is aborted during a git - # clone operation, git will remove the git work tree in - # its cleanup. The work tree in these jobs is the - # workspace directory, which means that subsequent - # jenkins post-build actions can not run because the - # workspace has been removed. - # To reduce the likelihood of this having an impact, - # recreate the workspace directory if needed - mkdir -p $WORKSPACE - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - https://opendev.org $ZUUL_PROJECT - 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: | - 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: | - if [ "4.5" != "latest" ]; then - export PUPPET_GEM_VERSION='~> 4.5.0' - fi - mkdir .bundled_gems - export GEM_HOME=`pwd`/.bundled_gems - gem install bundler --no-rdoc --no-ri --verbose - $GEM_HOME/bin/bundle install --retry 3 - $GEM_HOME/bin/bundle exec rake spec SPEC_OPTS='--format documentation' - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/puppet-midonet-puppet-unit-latest-centos-7/run.yaml b/playbooks/legacy/puppet-midonet-puppet-unit-latest-centos-7/run.yaml deleted file mode 100644 index 6d7f2a77..00000000 --- a/playbooks/legacy/puppet-midonet-puppet-unit-latest-centos-7/run.yaml +++ /dev/null @@ -1,83 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-puppet-midonet-puppet-unit-latest-centos-7 from old - job gate-puppet-midonet-puppet-unit-latest-centos-7 - roles: - - bindep - - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - # In cases where zuul-cloner is aborted during a git - # clone operation, git will remove the git work tree in - # its cleanup. The work tree in these jobs is the - # workspace directory, which means that subsequent - # jenkins post-build actions can not run because the - # workspace has been removed. - # To reduce the likelihood of this having an impact, - # recreate the workspace directory if needed - mkdir -p $WORKSPACE - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - https://opendev.org $ZUUL_PROJECT - 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: | - 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: | - if [ "latest" != "latest" ]; then - export PUPPET_GEM_VERSION='~> latest.0' - fi - mkdir .bundled_gems - export GEM_HOME=`pwd`/.bundled_gems - gem install bundler --no-rdoc --no-ri --verbose - $GEM_HOME/bin/bundle install --retry 3 - $GEM_HOME/bin/bundle exec rake spec SPEC_OPTS='--format documentation' - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/tempest-dsvm-neutron-full-centos-7/post.yaml b/playbooks/legacy/tempest-dsvm-neutron-full-centos-7/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-neutron-full-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=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/tempest-dsvm-neutron-full-centos-7/run.yaml b/playbooks/legacy/tempest-dsvm-neutron-full-centos-7/run.yaml deleted file mode 100644 index d4a166d6..00000000 --- a/playbooks/legacy/tempest-dsvm-neutron-full-centos-7/run.yaml +++ /dev/null @@ -1,57 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-neutron-full-centos-7 from old job gate-tempest-dsvm-neutron-full-centos-7-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - ENABLE_FILE_INJECTION=True - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TLSPROXY=1 - export DEVSTACK_GATE_USE_PYTHON3=False - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index d899ea2e..a4ff5875 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -11,18 +11,6 @@ nodes: - secondary -- nodeset: - name: centos-7-2-node - nodes: - - name: primary - label: centos-7 - - name: secondary - label: centos-7 - groups: - - name: subnodes - nodes: - - secondary - - nodeset: name: ubuntu-xenial-2-node nodes: @@ -50,12 +38,6 @@ - secondary-1 - secondary-2 -- nodeset: - name: legacy-centos-7 - nodes: - - name: primary - label: centos-7 - - nodeset: name: legacy-ubuntu-xenial nodes: diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index 075fe533..e4ea3f3d 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -3337,18 +3337,6 @@ jobs: - openstack-tox-snap-with-sudo -- project-template: - name: ansible-role-functional-jobs-centos7 - description: | - Run functional tests on ansible-role repositories using - CentOS 7 nodes. - check: - jobs: - - ansible-role-functional-centos-7 - gate: - jobs: - - ansible-role-functional-centos-7 - - project-template: name: ansible-role-functional-jobs-xenial description: | diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index 0575d3fa..b1bb15ae 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -303,20 +303,6 @@ timeout: 1800 nodeset: ubuntu-xenial -- job: - name: legacy-puppet-midonet-puppet-unit-4.5-centos-7 - parent: legacy-base - run: playbooks/legacy/puppet-midonet-puppet-unit-4.5-centos-7/run.yaml - timeout: 3600 - nodeset: legacy-centos-7 - -- job: - name: legacy-puppet-midonet-puppet-unit-latest-centos-7 - parent: legacy-base - run: playbooks/legacy/puppet-midonet-puppet-unit-latest-centos-7/run.yaml - timeout: 3600 - nodeset: legacy-centos-7 - - job: name: legacy-puppet-openstack-infra-spec-helper-unit parent: legacy-base @@ -541,18 +527,6 @@ - openstack/neutron - openstack/tempest -- job: - name: legacy-tempest-dsvm-neutron-full-centos-7 - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-neutron-full-centos-7/run.yaml - post-run: playbooks/legacy/tempest-dsvm-neutron-full-centos-7/post.yaml - timeout: 10800 - nodeset: legacy-centos-7 - required-projects: - - openstack/devstack-gate - - openstack/neutron - - openstack/tempest - - job: name: legacy-tempest-dsvm-neutron-pecan parent: legacy-dsvm-base diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml index 16acfc63..03765fbc 100644 --- a/zuul.d/zuul-legacy-project-templates.yaml +++ b/zuul.d/zuul-legacy-project-templates.yaml @@ -18,13 +18,3 @@ gate: jobs: - tempest-full - -- project-template: - name: puppet-module-unit-jobs - check: - jobs: - - legacy-puppet-unit-4.8-centos-7 - - legacy-puppet-unit-latest-centos-7 - gate: - jobs: - - legacy-puppet-unit-4.8-centos-7