diff --git a/playbooks/legacy/puppet-openstack-libraries-puppet-beaker-rspec-centos-7/post.yaml b/playbooks/legacy/puppet-openstack-libraries-puppet-beaker-rspec-centos-7/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/puppet-openstack-libraries-puppet-beaker-rspec-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/puppet-openstack-libraries-puppet-beaker-rspec-centos-7/run.yaml b/playbooks/legacy/puppet-openstack-libraries-puppet-beaker-rspec-centos-7/run.yaml deleted file mode 100644 index c8fc1a86..00000000 --- a/playbooks/legacy/puppet-openstack-libraries-puppet-beaker-rspec-centos-7/run.yaml +++ /dev/null @@ -1,104 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-puppet-openstack-libraries-puppet-beaker-rspec-centos-7 - from old job gate-puppet-openstack-libraries-puppet-beaker-rspec-centos-7 - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - ZUUL_BRANCH_REAL=${ZUUL_BRANCH:-master} - # Workaround for puppet-ceph, where we need to checkout - # puppet-openstack-integration from stable/pike when working on - # stable/jewel. - # Ceph Jewel works with Newton to Pike - if [[ "$ZUUL_BRANCH" == "stable/jewel" ]]; then - ZUUL_BRANCH_REAL='stable/pike' - fi - export ZUUL_REF=${ZUUL_REF:-None} - CLONEMAP=`mktemp` - function cleanup { - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: openstack/puppet-openstack-integration - dest: puppet-openstack-integration - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP \ - --cache-dir /opt/git \ - --zuul-branch $ZUUL_BRANCH_REAL \ - git://git.openstack.org openstack/puppet-openstack-integration - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - 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: | - 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 - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cd $ZUUL_PROJECT - trap "../../puppet-openstack-integration/copy_logs.sh" EXIT - ./run_beaker_tests.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/puppet-openstack-libraries-puppet-lint-centos-7/run.yaml b/playbooks/legacy/puppet-openstack-libraries-puppet-lint-centos-7/run.yaml deleted file mode 100644 index 72932681..00000000 --- a/playbooks/legacy/puppet-openstack-libraries-puppet-lint-centos-7/run.yaml +++ /dev/null @@ -1,51 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-puppet-openstack-libraries-puppet-lint-centos-7 from - old job gate-puppet-openstack-libraries-puppet-lint-centos-7 - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - 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 -e - set -x - cd $ZUUL_PROJECT - ./run_lint_tests.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/puppet-openstack-libraries-puppet-syntax-3-centos-7/run.yaml b/playbooks/legacy/puppet-openstack-libraries-puppet-syntax-3-centos-7/run.yaml deleted file mode 100644 index 4800f53b..00000000 --- a/playbooks/legacy/puppet-openstack-libraries-puppet-syntax-3-centos-7/run.yaml +++ /dev/null @@ -1,52 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-puppet-openstack-libraries-puppet-syntax-3-legacy-centos-7 - from old job gate-puppet-openstack-libraries-puppet-syntax-3-legacy-centos-7 - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - 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 -e - set -x - cd $ZUUL_PROJECT - export PUPPET_VERSION="3" - ./run_syntax_tests.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/puppet-openstack-libraries-puppet-syntax-4-centos-7/run.yaml b/playbooks/legacy/puppet-openstack-libraries-puppet-syntax-4-centos-7/run.yaml deleted file mode 100644 index e248b070..00000000 --- a/playbooks/legacy/puppet-openstack-libraries-puppet-syntax-4-centos-7/run.yaml +++ /dev/null @@ -1,52 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-puppet-openstack-libraries-puppet-syntax-4-centos-7 - from old job gate-puppet-openstack-libraries-puppet-syntax-4-centos-7 - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - 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 -e - set -x - cd $ZUUL_PROJECT - export PUPPET_VERSION="4" - ./run_syntax_tests.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/puppet-openstack-libraries-puppet-unit-centos-7/run.yaml b/playbooks/legacy/puppet-openstack-libraries-puppet-unit-centos-7/run.yaml deleted file mode 100644 index c5b93a38..00000000 --- a/playbooks/legacy/puppet-openstack-libraries-puppet-unit-centos-7/run.yaml +++ /dev/null @@ -1,51 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-puppet-openstack-libraries-puppet-unit-centos-7 from - old job gate-puppet-openstack-libraries-puppet-unit-centos-7 - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - 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 -e - set -x - cd $ZUUL_PROJECT - ./run_unit_tests.sh - executable: /bin/bash - 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 128ddd05..af765fc7 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -2137,77 +2137,6 @@ required-projects: - openstack-infra/puppet-openstackci -- job: - name: legacy-puppet-openstack-libraries-puppet-beaker-rspec-centos-7 - parent: legacy-puppet-openstack-integration - run: playbooks/legacy/puppet-openstack-libraries-puppet-beaker-rspec-centos-7/run.yaml - post-run: playbooks/legacy/puppet-openstack-libraries-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-openstack-libraries-puppet-lint-centos-7 - parent: legacy-puppet-openstack-integration - run: playbooks/legacy/puppet-openstack-libraries-puppet-lint-centos-7/run.yaml - timeout: 3600 - nodeset: legacy-centos-7 - -- job: - name: legacy-puppet-openstack-libraries-puppet-syntax-3-legacy-centos-7 - parent: legacy-puppet-openstack-integration - run: playbooks/legacy/puppet-openstack-libraries-puppet-syntax-3-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-openstack-libraries-puppet-syntax-4-centos-7 - parent: legacy-puppet-openstack-integration - run: playbooks/legacy/puppet-openstack-libraries-puppet-syntax-4-centos-7/run.yaml - timeout: 3600 - nodeset: legacy-centos-7 - irrelevant-files: - - ^.*\.md$ - - ^.*\.rst$ - - ^doc/.*$ - - ^etc/.*$ - - ^metadata.json$ - - ^releasenotes/.*$ - - ^test-requirements.txt$ - -- job: - name: legacy-puppet-openstack-libraries-puppet-unit-centos-7 - parent: legacy-puppet-openstack-integration - run: playbooks/legacy/puppet-openstack-libraries-puppet-unit-centos-7/run.yaml - timeout: 3600 - nodeset: legacy-centos-7 - irrelevant-files: - - ^.*\.md$ - - ^.*\.rst$ - - ^doc/.*$ - - ^etc/.*$ - - ^metadata.json$ - - ^releasenotes/.*$ - - ^test-requirements.txt$ - - job: name: legacy-puppet-openstackci-puppet-beaker-rspec parent: legacy-openstackci-base diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml index 85c46bcb..83f8d296 100644 --- a/zuul.d/zuul-legacy-project-templates.yaml +++ b/zuul.d/zuul-legacy-project-templates.yaml @@ -194,26 +194,6 @@ - legacy-puppet-unit-3.8-legacy-centos-7 - legacy-puppet-unit-4.8-centos-7 -- project-template: - name: puppet-openstack-libraries-jobs - check: - jobs: - - legacy-puppet-openstack-libraries-puppet-lint-centos-7 - - legacy-puppet-openstack-libraries-puppet-syntax-3-legacy-centos-7: - branches: ^(stable/(newton|ocata)).*$ - - legacy-puppet-openstack-libraries-puppet-syntax-4-centos-7 - - legacy-puppet-openstack-libraries-puppet-unit-centos-7 - - legacy-puppet-openstack-libraries-puppet-beaker-rspec-centos-7 - gate: - jobs: - - legacy-puppet-openstack-libraries-puppet-lint-centos-7 - - legacy-puppet-openstack-libraries-puppet-syntax-3-legacy-centos-7: - branches: ^(stable/(newton|ocata)).*$ - - legacy-puppet-openstack-libraries-puppet-syntax-4-centos-7 - - legacy-puppet-openstack-libraries-puppet-unit-centos-7 - - legacy-puppet-openstack-libraries-puppet-beaker-rspec-centos-7 - - - project-template: name: puppet-syntax check: