diff --git a/playbooks/legacy/puppet-syntax-3-centos-7/run.yaml b/playbooks/legacy/puppet-syntax-3-centos-7/run.yaml deleted file mode 100644 index 38c31e9d..00000000 --- a/playbooks/legacy/puppet-syntax-3-centos-7/run.yaml +++ /dev/null @@ -1,84 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-puppet-syntax-3-legacy-centos-7 from old job gate-{name}-puppet-syntax-3-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: | - export PUPPET_GEM_VERSION='~> 3' - mkdir .bundled_gems - export GEM_HOME=`pwd`/.bundled_gems - gem install bundler --no-rdoc --no-ri --verbose - $GEM_HOME/bin/bundle install --retry 3 - # FUTURE_PARSER=yes is only supported by Puppet 3.x - if [ "3" -lt "4" ]; then - export FUTURE_PARSER=yes - fi - $GEM_HOME/bin/bundle exec rake syntax - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/puppet-syntax-3/run.yaml b/playbooks/legacy/puppet-syntax-3/run.yaml deleted file mode 100644 index ca11199d..00000000 --- a/playbooks/legacy/puppet-syntax-3/run.yaml +++ /dev/null @@ -1,84 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-puppet-syntax-3 from old job gate-{name}-puppet-syntax-3-ubuntu-xenial - 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: | - export PUPPET_GEM_VERSION='~> 3' - mkdir .bundled_gems - export GEM_HOME=`pwd`/.bundled_gems - gem install bundler --no-rdoc --no-ri --verbose --version '<2.0.0' - $GEM_HOME/bin/bundle install --retry 3 - # FUTURE_PARSER=yes is only supported by Puppet 3.x - if [ "3" -lt "4" ]; then - export FUTURE_PARSER=yes - fi - $GEM_HOME/bin/bundle exec rake syntax - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/system-config-puppet-syntax-3/run.yaml b/playbooks/legacy/system-config-puppet-syntax-3/run.yaml deleted file mode 100644 index 9fe5c6aa..00000000 --- a/playbooks/legacy/system-config-puppet-syntax-3/run.yaml +++ /dev/null @@ -1,84 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-system-config-puppet-syntax-3 from old job gate-system-config-puppet-syntax-3-ubuntu-xenial - 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: | - export PUPPET_GEM_VERSION='~> 3' - mkdir .bundled_gems - export GEM_HOME=`pwd`/.bundled_gems - gem install bundler --no-rdoc --no-ri --verbose --version '<2.0.0' - $GEM_HOME/bin/bundle install --retry 3 - # FUTURE_PARSER=yes is only supported by Puppet 3.x - if [ "3" -lt "4" ]; then - export FUTURE_PARSER=yes - fi - $GEM_HOME/bin/bundle exec rake syntax - 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 2345eb86..cc606258 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -986,20 +986,6 @@ run: playbooks/legacy/puppet-storyboard-forge-upload/run.yaml timeout: 1800 -- job: - name: legacy-puppet-syntax-3 - parent: legacy-puppet-openstack-integration - run: playbooks/legacy/puppet-syntax-3/run.yaml - timeout: 1800 - nodeset: legacy-ubuntu-xenial - -- job: - name: legacy-puppet-syntax-3-centos-7 - parent: legacy-puppet-openstack-integration - run: playbooks/legacy/puppet-syntax-3-centos-7/run.yaml - timeout: 1800 - nodeset: legacy-centos-7 - - job: name: legacy-puppet-syntax-4-centos-7 parent: legacy-puppet-openstack-integration @@ -1103,13 +1089,6 @@ timeout: 2400 nodeset: legacy-ubuntu-trusty -- job: - name: legacy-system-config-puppet-syntax-3 - parent: legacy-base - run: playbooks/legacy/system-config-puppet-syntax-3/run.yaml - timeout: 1800 - nodeset: legacy-ubuntu-xenial - - job: name: legacy-tempest-almanach-dsvm parent: legacy-dsvm-base diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml index 0cf2fbfd..126943c3 100644 --- a/zuul.d/zuul-legacy-project-templates.yaml +++ b/zuul.d/zuul-legacy-project-templates.yaml @@ -36,12 +36,10 @@ check: jobs: - legacy-puppet-lint - - legacy-puppet-syntax-3 - legacy-puppet-syntax-4-centos-7 gate: jobs: - legacy-puppet-lint - - legacy-puppet-syntax-3 - legacy-puppet-syntax-4-centos-7 - project-template: @@ -101,9 +99,7 @@ name: puppet-syntax check: jobs: - - legacy-puppet-syntax-3-centos-7 - legacy-puppet-syntax-4-centos-7 gate: jobs: - - legacy-puppet-syntax-3-centos-7 - legacy-puppet-syntax-4-centos-7