diff --git a/playbooks/legacy/puppet-midonet-puppet-unit-3.6-centos-7/run.yaml b/playbooks/legacy/puppet-midonet-puppet-unit-3.6-centos-7/run.yaml deleted file mode 100644 index 4c0b0042..00000000 --- a/playbooks/legacy/puppet-midonet-puppet-unit-3.6-centos-7/run.yaml +++ /dev/null @@ -1,83 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-puppet-midonet-puppet-unit-3.6-centos-7 from old - job gate-puppet-midonet-puppet-unit-3.6-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 [ "3.6" != "latest" ]; then - export PUPPET_GEM_VERSION='~> 3.6.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-3.8-centos-7/run.yaml b/playbooks/legacy/puppet-midonet-puppet-unit-3.8-centos-7/run.yaml deleted file mode 100644 index 4950aaac..00000000 --- a/playbooks/legacy/puppet-midonet-puppet-unit-3.8-centos-7/run.yaml +++ /dev/null @@ -1,83 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-puppet-midonet-puppet-unit-3.8-centos-7 from old - job gate-puppet-midonet-puppet-unit-3.8-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 [ "3.8" != "latest" ]; then - export PUPPET_GEM_VERSION='~> 3.8.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-unit-3.6-centos-7/run.yaml b/playbooks/legacy/puppet-unit-3.6-centos-7/run.yaml deleted file mode 100644 index ceb17873..00000000 --- a/playbooks/legacy/puppet-unit-3.6-centos-7/run.yaml +++ /dev/null @@ -1,82 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-puppet-unit-3.6-legacy-centos-7 from old job gate-{name}-puppet-unit-3.6-legacy-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 [ "3.6" != "latest" ]; then - export PUPPET_GEM_VERSION='~> 3.6.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-unit-3.8-centos-7/run.yaml b/playbooks/legacy/puppet-unit-3.8-centos-7/run.yaml deleted file mode 100644 index f010db7a..00000000 --- a/playbooks/legacy/puppet-unit-3.8-centos-7/run.yaml +++ /dev/null @@ -1,82 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-puppet-unit-3.8-legacy-centos-7 from old job gate-{name}-puppet-unit-3.8-legacy-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 [ "3.8" != "latest" ]; then - export PUPPET_GEM_VERSION='~> 3.8.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/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index d9c8ae74..79c162f7 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -871,24 +871,6 @@ - ^releasenotes/.*$ - ^test-requirements.txt$ -- job: - name: legacy-puppet-beaker-rspec-centos-7 - parent: legacy-puppet-openstack-integration - run: playbooks/legacy/puppet-beaker-rspec-centos-7/run.yaml - post-run: playbooks/legacy/puppet-beaker-rspec-centos-7/post.yaml - timeout: 3600 - nodeset: legacy-centos-7 - required-projects: - - openstack/puppet-openstack-integration - irrelevant-files: - - ^.*\.md$ - - ^.*\.rst$ - - ^doc/.*$ - - ^etc/.*$ - - ^metadata.json$ - - ^releasenotes/.*$ - - ^test-requirements.txt$ - - job: name: legacy-puppet-httpd-forge-upload parent: legacy-base @@ -902,20 +884,6 @@ timeout: 1800 nodeset: ubuntu-xenial -- job: - name: legacy-puppet-midonet-puppet-unit-3.6-centos-7 - parent: legacy-base - run: playbooks/legacy/puppet-midonet-puppet-unit-3.6-centos-7/run.yaml - timeout: 3600 - nodeset: legacy-centos-7 - -- job: - name: legacy-puppet-midonet-puppet-unit-3.8-centos-7 - parent: legacy-base - run: playbooks/legacy/puppet-midonet-puppet-unit-3.8-centos-7/run.yaml - timeout: 3600 - nodeset: legacy-centos-7 - - job: name: legacy-puppet-midonet-puppet-unit-4.5-centos-7 parent: legacy-base @@ -969,38 +937,6 @@ timeout: 1800 nodeset: legacy-centos-7 -- job: - name: legacy-puppet-unit-3.6-legacy-centos-7 - parent: legacy-puppet-openstack-integration - run: playbooks/legacy/puppet-unit-3.6-centos-7/run.yaml - timeout: 3600 - nodeset: legacy-centos-7 - branches: ^(stable/(newton|ocata)).*$ - irrelevant-files: - - ^.*\.md$ - - ^.*\.rst$ - - ^doc/.*$ - - ^etc/.*$ - - ^metadata.json$ - - ^releasenotes/.*$ - - ^test-requirements.txt$ - -- job: - name: legacy-puppet-unit-3.8-legacy-centos-7 - parent: legacy-puppet-openstack-integration - run: playbooks/legacy/puppet-unit-3.8-centos-7/run.yaml - timeout: 3600 - nodeset: legacy-centos-7 - branches: ^(stable/(newton|ocata)).*$ - irrelevant-files: - - ^.*\.md$ - - ^.*\.rst$ - - ^doc/.*$ - - ^etc/.*$ - - ^metadata.json$ - - ^releasenotes/.*$ - - ^test-requirements.txt$ - - job: name: legacy-puppet-unit-4.8-centos-7 parent: legacy-puppet-openstack-integration diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml index 126943c3..3af9b1ed 100644 --- a/zuul.d/zuul-legacy-project-templates.yaml +++ b/zuul.d/zuul-legacy-project-templates.yaml @@ -72,27 +72,14 @@ - legacy-tempest-dsvm-neutron-src-plugin -- project-template: # Used by puppet-midonet - name: puppet-beaker-jobs - check: - jobs: - - legacy-puppet-beaker-rspec-centos-7 - gate: - jobs: - - legacy-puppet-beaker-rspec-centos-7 - - project-template: name: puppet-module-unit-jobs check: jobs: - - legacy-puppet-unit-3.6-legacy-centos-7 - - legacy-puppet-unit-3.8-legacy-centos-7 - legacy-puppet-unit-4.8-centos-7 - legacy-puppet-unit-latest-centos-7 gate: jobs: - - legacy-puppet-unit-3.6-legacy-centos-7 - - legacy-puppet-unit-3.8-legacy-centos-7 - legacy-puppet-unit-4.8-centos-7 - project-template: