From c2870d4c4cb0edb32b269d25295086e00cd66d25 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 2 Nov 2017 10:14:59 -0600 Subject: [PATCH] Cleanup old legacy jobs no longer referenced As part of I247993de1149cced97170363d97f066b2bc1203b we removed the tripleo jobs from the puppet projects. This removed the only reference for the tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-* jobs so let's remove the playbooks and jobs as well. Change-Id: I78a659dd2bb1fb72bf54f097b5a7c4b8a044338d --- .../post.yaml | 34 ------- .../run.yaml | 98 ------------------- .../post.yaml | 34 ------- .../run.yaml | 98 ------------------- .../post.yaml | 34 ------- .../run.yaml | 98 ------------------- zuul.d/zuul-legacy-jobs.yaml | 24 ----- 7 files changed, 420 deletions(-) delete mode 100644 playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton/post.yaml delete mode 100644 playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton/run.yaml delete mode 100644 playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata/post.yaml delete mode 100644 playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata/run.yaml delete mode 100644 playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-pike/post.yaml delete mode 100644 playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-pike/run.yaml diff --git a/playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton/post.yaml b/playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton/post.yaml deleted file mode 100644 index 2a68422d..00000000 --- a/playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton/post.yaml +++ /dev/null @@ -1,34 +0,0 @@ -- hosts: primary - tasks: - - - name: Ensure artifacts directory exists - file: - path: '{{ zuul.executor.work_root }}/artifacts' - state: directory - delegate_to: localhost - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.work_root }}/artifacts/images/' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/images/* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton/run.yaml b/playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton/run.yaml deleted file mode 100644 index deb6f68e..00000000 --- a/playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton/run.yaml +++ /dev/null @@ -1,98 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton - from old job gate-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton - 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-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export TOCI_JOBTYPE=ovb-1ctlr_1comp_1ceph-featureset024 - - # ZUUL does not set these for periodic jobs - export ZUUL_BRANCH=${ZUUL_BRANCH:-master} - export ZUUL_REF=${ZUUL_REF:-None} - - export BRANCH_OVERRIDE=stable/newton - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_HORIZON=1 - - export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/dib-utils $PROJECTS" - export PROJECTS="openstack/instack $PROJECTS" - export PROJECTS="openstack/instack-undercloud $PROJECTS" - export PROJECTS="openstack/puppet-aodh $PROJECTS" - export PROJECTS="openstack/puppet-barbican $PROJECTS" - export PROJECTS="openstack/puppet-ceilometer $PROJECTS" - export PROJECTS="openstack/puppet-ceph $PROJECTS" - export PROJECTS="openstack/puppet-cinder $PROJECTS" - export PROJECTS="openstack/puppet-ganesha $PROJECTS" - export PROJECTS="openstack/puppet-glance $PROJECTS" - export PROJECTS="openstack/puppet-gnocchi $PROJECTS" - export PROJECTS="openstack/puppet-heat $PROJECTS" - export PROJECTS="openstack/puppet-horizon $PROJECTS" - export PROJECTS="openstack/puppet-ironic $PROJECTS" - export PROJECTS="openstack/puppet-keystone $PROJECTS" - export PROJECTS="openstack/puppet-mistral $PROJECTS" - export PROJECTS="openstack/puppet-neutron $PROJECTS" - export PROJECTS="openstack/puppet-nova $PROJECTS" - export PROJECTS="openstack/puppet-openstack_extras $PROJECTS" - export PROJECTS="openstack/puppet-openstacklib $PROJECTS" - export PROJECTS="openstack/puppet-oslo $PROJECTS" - export PROJECTS="openstack/puppet-pacemaker $PROJECTS" - export PROJECTS="openstack/puppet-sahara $PROJECTS" - export PROJECTS="openstack/puppet-swift $PROJECTS" - export PROJECTS="openstack/puppet-tripleo $PROJECTS" - export PROJECTS="openstack/puppet-vswitch $PROJECTS" - export PROJECTS="openstack/puppet-zaqar $PROJECTS" - export PROJECTS="openstack/python-ironic-inspector-client $PROJECTS" - export PROJECTS="openstack/python-tripleoclient $PROJECTS" - export PROJECTS="openstack/tripleo-common $PROJECTS" - export PROJECTS="openstack/tripleo-puppet-elements $PROJECTS" - export PROJECTS="openstack/tripleo-quickstart $PROJECTS" - export PROJECTS="openstack/tripleo-quickstart-extras $PROJECTS" - export PROJECTS="openstack/tripleo-ui $PROJECTS" - - # some projects are not in devstack-gate, we need them to grab logs: - export PROJECTS="openstack/aodh $PROJECTS" - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/panko $PROJECTS" - export PROJECTS="openstack/mistral $PROJECTS" - - sudo chown -hR $(whoami) /opt/git - function gate_hook { - bash -xe /opt/stack/new/tripleo-ci/toci_gate_test.sh - } - export -f gate_hook - 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/playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata/post.yaml b/playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata/post.yaml deleted file mode 100644 index 2a68422d..00000000 --- a/playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata/post.yaml +++ /dev/null @@ -1,34 +0,0 @@ -- hosts: primary - tasks: - - - name: Ensure artifacts directory exists - file: - path: '{{ zuul.executor.work_root }}/artifacts' - state: directory - delegate_to: localhost - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.work_root }}/artifacts/images/' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/images/* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata/run.yaml b/playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata/run.yaml deleted file mode 100644 index d85b6455..00000000 --- a/playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata/run.yaml +++ /dev/null @@ -1,98 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata - from old job gate-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata - 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-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export TOCI_JOBTYPE=ovb-1ctlr_1comp_1ceph-featureset024 - - # ZUUL does not set these for periodic jobs - export ZUUL_BRANCH=${ZUUL_BRANCH:-master} - export ZUUL_REF=${ZUUL_REF:-None} - - export BRANCH_OVERRIDE=stable/ocata - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_HORIZON=1 - - export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/dib-utils $PROJECTS" - export PROJECTS="openstack/instack $PROJECTS" - export PROJECTS="openstack/instack-undercloud $PROJECTS" - export PROJECTS="openstack/puppet-aodh $PROJECTS" - export PROJECTS="openstack/puppet-barbican $PROJECTS" - export PROJECTS="openstack/puppet-ceilometer $PROJECTS" - export PROJECTS="openstack/puppet-ceph $PROJECTS" - export PROJECTS="openstack/puppet-cinder $PROJECTS" - export PROJECTS="openstack/puppet-ganesha $PROJECTS" - export PROJECTS="openstack/puppet-glance $PROJECTS" - export PROJECTS="openstack/puppet-gnocchi $PROJECTS" - export PROJECTS="openstack/puppet-heat $PROJECTS" - export PROJECTS="openstack/puppet-horizon $PROJECTS" - export PROJECTS="openstack/puppet-ironic $PROJECTS" - export PROJECTS="openstack/puppet-keystone $PROJECTS" - export PROJECTS="openstack/puppet-mistral $PROJECTS" - export PROJECTS="openstack/puppet-neutron $PROJECTS" - export PROJECTS="openstack/puppet-nova $PROJECTS" - export PROJECTS="openstack/puppet-openstack_extras $PROJECTS" - export PROJECTS="openstack/puppet-openstacklib $PROJECTS" - export PROJECTS="openstack/puppet-oslo $PROJECTS" - export PROJECTS="openstack/puppet-pacemaker $PROJECTS" - export PROJECTS="openstack/puppet-sahara $PROJECTS" - export PROJECTS="openstack/puppet-swift $PROJECTS" - export PROJECTS="openstack/puppet-tripleo $PROJECTS" - export PROJECTS="openstack/puppet-vswitch $PROJECTS" - export PROJECTS="openstack/puppet-zaqar $PROJECTS" - export PROJECTS="openstack/python-ironic-inspector-client $PROJECTS" - export PROJECTS="openstack/python-tripleoclient $PROJECTS" - export PROJECTS="openstack/tripleo-common $PROJECTS" - export PROJECTS="openstack/tripleo-puppet-elements $PROJECTS" - export PROJECTS="openstack/tripleo-quickstart $PROJECTS" - export PROJECTS="openstack/tripleo-quickstart-extras $PROJECTS" - export PROJECTS="openstack/tripleo-ui $PROJECTS" - - # some projects are not in devstack-gate, we need them to grab logs: - export PROJECTS="openstack/aodh $PROJECTS" - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/panko $PROJECTS" - export PROJECTS="openstack/mistral $PROJECTS" - - sudo chown -hR $(whoami) /opt/git - function gate_hook { - bash -xe /opt/stack/new/tripleo-ci/toci_gate_test.sh - } - export -f gate_hook - 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/playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-pike/post.yaml b/playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-pike/post.yaml deleted file mode 100644 index 2a68422d..00000000 --- a/playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-pike/post.yaml +++ /dev/null @@ -1,34 +0,0 @@ -- hosts: primary - tasks: - - - name: Ensure artifacts directory exists - file: - path: '{{ zuul.executor.work_root }}/artifacts' - state: directory - delegate_to: localhost - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.work_root }}/artifacts/images/' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/images/* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-pike/run.yaml b/playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-pike/run.yaml deleted file mode 100644 index 0dfc8cde..00000000 --- a/playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-pike/run.yaml +++ /dev/null @@ -1,98 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-pike - from old job gate-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-pike - 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-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export TOCI_JOBTYPE=ovb-1ctlr_1comp_1ceph-featureset024 - - # ZUUL does not set these for periodic jobs - export ZUUL_BRANCH=${ZUUL_BRANCH:-master} - export ZUUL_REF=${ZUUL_REF:-None} - - export BRANCH_OVERRIDE=stable/pike - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_HORIZON=1 - - export PROJECTS="openstack/diskimage-builder $PROJECTS" - export PROJECTS="openstack/dib-utils $PROJECTS" - export PROJECTS="openstack/instack $PROJECTS" - export PROJECTS="openstack/instack-undercloud $PROJECTS" - export PROJECTS="openstack/puppet-aodh $PROJECTS" - export PROJECTS="openstack/puppet-barbican $PROJECTS" - export PROJECTS="openstack/puppet-ceilometer $PROJECTS" - export PROJECTS="openstack/puppet-ceph $PROJECTS" - export PROJECTS="openstack/puppet-cinder $PROJECTS" - export PROJECTS="openstack/puppet-ganesha $PROJECTS" - export PROJECTS="openstack/puppet-glance $PROJECTS" - export PROJECTS="openstack/puppet-gnocchi $PROJECTS" - export PROJECTS="openstack/puppet-heat $PROJECTS" - export PROJECTS="openstack/puppet-horizon $PROJECTS" - export PROJECTS="openstack/puppet-ironic $PROJECTS" - export PROJECTS="openstack/puppet-keystone $PROJECTS" - export PROJECTS="openstack/puppet-mistral $PROJECTS" - export PROJECTS="openstack/puppet-neutron $PROJECTS" - export PROJECTS="openstack/puppet-nova $PROJECTS" - export PROJECTS="openstack/puppet-openstack_extras $PROJECTS" - export PROJECTS="openstack/puppet-openstacklib $PROJECTS" - export PROJECTS="openstack/puppet-oslo $PROJECTS" - export PROJECTS="openstack/puppet-pacemaker $PROJECTS" - export PROJECTS="openstack/puppet-sahara $PROJECTS" - export PROJECTS="openstack/puppet-swift $PROJECTS" - export PROJECTS="openstack/puppet-tripleo $PROJECTS" - export PROJECTS="openstack/puppet-vswitch $PROJECTS" - export PROJECTS="openstack/puppet-zaqar $PROJECTS" - export PROJECTS="openstack/python-ironic-inspector-client $PROJECTS" - export PROJECTS="openstack/python-tripleoclient $PROJECTS" - export PROJECTS="openstack/tripleo-common $PROJECTS" - export PROJECTS="openstack/tripleo-puppet-elements $PROJECTS" - export PROJECTS="openstack/tripleo-quickstart $PROJECTS" - export PROJECTS="openstack/tripleo-quickstart-extras $PROJECTS" - export PROJECTS="openstack/tripleo-ui $PROJECTS" - - # some projects are not in devstack-gate, we need them to grab logs: - export PROJECTS="openstack/aodh $PROJECTS" - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/panko $PROJECTS" - export PROJECTS="openstack/mistral $PROJECTS" - - sudo chown -hR $(whoami) /opt/git - function gate_hook { - bash -xe /opt/stack/new/tripleo-ci/toci_gate_test.sh - } - export -f gate_hook - 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/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index 0c7a779c..28e53465 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -8846,30 +8846,6 @@ timeout: 10800 nodeset: legacy-tripleo-centos-7 -- job: - name: legacy-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton - parent: legacy-tripleo-ci-dsvm - run: playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton/run.yaml - post-run: playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton/post.yaml - timeout: 10800 - nodeset: legacy-tripleo-centos-7 - -- job: - name: legacy-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata - parent: legacy-tripleo-ci-dsvm - run: playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata/run.yaml - post-run: playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata/post.yaml - timeout: 10800 - nodeset: legacy-tripleo-centos-7 - -- job: - name: legacy-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-pike - parent: legacy-tripleo-ci-dsvm - run: playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-pike/run.yaml - post-run: playbooks/legacy/tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-pike/post.yaml - timeout: 10800 - nodeset: legacy-tripleo-centos-7 - - job: name: legacy-tripleo-ci-centos-7-ovb-containers-oooq parent: legacy-tripleo-ci-dsvm