From 57c37e2bf29c8cd63ad5e25dd32c52dd700f12ec Mon Sep 17 00:00:00 2001 From: Javier Pena Date: Mon, 2 Oct 2017 13:37:52 +0200 Subject: [PATCH] Remove legacy Packstack jobs They are being moved to in-repo jobs at https://review.openstack.org/508434 Change-Id: Ib404f256739d814503391d55b8b72df960b7bd28 Depends-On: I550efb431ce996f70d3602a4b42cd97ad3a20831 --- .../post.yaml | 15 ---- .../run.yaml | 72 ------------------- .../post.yaml | 15 ---- .../run.yaml | 72 ------------------- .../post.yaml | 15 ---- .../run.yaml | 72 ------------------- zuul.d/zuul-legacy-jobs.yaml | 33 --------- zuul.d/zuul-legacy-project-templates.yaml | 13 ---- 8 files changed, 307 deletions(-) delete mode 100644 playbooks/legacy/packstack-integration-scenario001-tempest-centos-7/post.yaml delete mode 100644 playbooks/legacy/packstack-integration-scenario001-tempest-centos-7/run.yaml delete mode 100644 playbooks/legacy/packstack-integration-scenario002-tempest-centos-7/post.yaml delete mode 100644 playbooks/legacy/packstack-integration-scenario002-tempest-centos-7/run.yaml delete mode 100644 playbooks/legacy/packstack-integration-scenario003-tempest-centos-7/post.yaml delete mode 100644 playbooks/legacy/packstack-integration-scenario003-tempest-centos-7/run.yaml diff --git a/playbooks/legacy/packstack-integration-scenario001-tempest-centos-7/post.yaml b/playbooks/legacy/packstack-integration-scenario001-tempest-centos-7/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/packstack-integration-scenario001-tempest-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/packstack-integration-scenario001-tempest-centos-7/run.yaml b/playbooks/legacy/packstack-integration-scenario001-tempest-centos-7/run.yaml deleted file mode 100644 index 168bb72d..00000000 --- a/playbooks/legacy/packstack-integration-scenario001-tempest-centos-7/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-packstack-integration-scenario001-tempest-centos-7 - from old job gate-packstack-integration-scenario001-tempest-centos-7 - 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 \ - 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 - export SCENARIO=scenario001 - ./run_tests.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/packstack-integration-scenario002-tempest-centos-7/post.yaml b/playbooks/legacy/packstack-integration-scenario002-tempest-centos-7/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/packstack-integration-scenario002-tempest-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/packstack-integration-scenario002-tempest-centos-7/run.yaml b/playbooks/legacy/packstack-integration-scenario002-tempest-centos-7/run.yaml deleted file mode 100644 index 39829c2b..00000000 --- a/playbooks/legacy/packstack-integration-scenario002-tempest-centos-7/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-packstack-integration-scenario002-tempest-centos-7 - from old job gate-packstack-integration-scenario002-tempest-centos-7 - 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 \ - 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 - export SCENARIO=scenario002 - ./run_tests.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/packstack-integration-scenario003-tempest-centos-7/post.yaml b/playbooks/legacy/packstack-integration-scenario003-tempest-centos-7/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/packstack-integration-scenario003-tempest-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/packstack-integration-scenario003-tempest-centos-7/run.yaml b/playbooks/legacy/packstack-integration-scenario003-tempest-centos-7/run.yaml deleted file mode 100644 index acde5318..00000000 --- a/playbooks/legacy/packstack-integration-scenario003-tempest-centos-7/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-packstack-integration-scenario003-tempest-centos-7 - from old job gate-packstack-integration-scenario003-tempest-centos-7 - 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 \ - 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 - export SCENARIO=scenario003 - ./run_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 9ab5e454..a699ca46 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -7695,39 +7695,6 @@ required-projects: - openstack/requirements -- job: - name: legacy-packstack-integration-scenario001-tempest-centos-7 - parent: legacy-base - run: playbooks/legacy/packstack-integration-scenario001-tempest-centos-7/run - post-run: playbooks/legacy/packstack-integration-scenario001-tempest-centos-7/post - timeout: 3600 - nodeset: legacy-centos-7 - irrelevant-files: - - ^docs/.*$ - - ^releasenotes/.*$ - -- job: - name: legacy-packstack-integration-scenario002-tempest-centos-7 - parent: legacy-base - run: playbooks/legacy/packstack-integration-scenario002-tempest-centos-7/run - post-run: playbooks/legacy/packstack-integration-scenario002-tempest-centos-7/post - timeout: 3600 - nodeset: legacy-centos-7 - irrelevant-files: - - ^docs/.*$ - - ^releasenotes/.*$ - -- job: - name: legacy-packstack-integration-scenario003-tempest-centos-7 - parent: legacy-base - run: playbooks/legacy/packstack-integration-scenario003-tempest-centos-7/run - post-run: playbooks/legacy/packstack-integration-scenario003-tempest-centos-7/post - timeout: 3600 - nodeset: legacy-centos-7 - irrelevant-files: - - ^docs/.*$ - - ^releasenotes/.*$ - - job: name: legacy-panko-tox-py27-mongodb parent: legacy-base diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml index 6a043e53..05390c6b 100644 --- a/zuul.d/zuul-legacy-project-templates.yaml +++ b/zuul.d/zuul-legacy-project-templates.yaml @@ -1100,19 +1100,6 @@ - legacy-check-osc-plugins: voting: false -- project-template: - name: packstack-integration-jobs - check: - jobs: - - legacy-packstack-integration-scenario001-tempest-centos-7 - - legacy-packstack-integration-scenario002-tempest-centos-7 - - legacy-packstack-integration-scenario003-tempest-centos-7 - gate: - jobs: - - legacy-packstack-integration-scenario001-tempest-centos-7 - - legacy-packstack-integration-scenario002-tempest-centos-7 - - legacy-packstack-integration-scenario003-tempest-centos-7 - - project-template: name: periodic-jobs-with-neutron-lib-master periodic: