From 69dedca573957a9bb33de88f1eb1a23df15bfb6d Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 3 Nov 2017 12:35:12 +0100 Subject: [PATCH] Remove unused helm-infra jobs These have been removed in I0a1a63d0615275cf6bb78a1b5f8fb8f380b411c5, remove them here as well since they are in-repo now. Change-Id: I3b6a37d07ab80daa615f2a6f9e6bc1b4b10c92b3 --- .../post.yaml | 15 ---- .../run.yaml | 70 ------------------- .../post.yaml | 15 ---- .../run.yaml | 70 ------------------- .../post.yaml | 15 ---- .../run.yaml | 70 ------------------- .../post.yaml | 15 ---- .../run.yaml | 70 ------------------- zuul.d/zuul-legacy-jobs.yaml | 30 -------- 9 files changed, 370 deletions(-) delete mode 100644 playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-centos-7/post.yaml delete mode 100644 playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-centos-7/run.yaml delete mode 100644 playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-fedora-26/post.yaml delete mode 100644 playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-fedora-26/run.yaml delete mode 100644 playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd/post.yaml delete mode 100644 playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd/run.yaml delete mode 100644 playbooks/legacy/openstack-helm-infra-nocluster-linter-ovs-rbd/post.yaml delete mode 100644 playbooks/legacy/openstack-helm-infra-nocluster-linter-ovs-rbd/run.yaml diff --git a/playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-centos-7/post.yaml b/playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-centos-7/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-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/openstack-helm-infra-aio-basic-ovs-rbd-centos-7/run.yaml b/playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-centos-7/run.yaml deleted file mode 100644 index 194ab069..00000000 --- a/playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-centos-7/run.yaml +++ /dev/null @@ -1,70 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-openstack-helm-infra-aio-basic-ovs-rbd-centos-7 from - old job gate-openstack-helm-infra-aio-basic-ovs-rbd-centos-7-nv - 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 - export INTEGRATION=aio - export INTEGRATION_TYPE=basic - export SUB=-infra - export SDN_PLUGIN=ovs - export GLANCE=rbd - export GATE_ENVIRONMENT=zuul - - TOOLKIT_TMP=$HOME/infra - mkdir -p $TOOLKIT_TMP - - if [ "$SUB" != "-infra" ] ; then - /usr/zuul-env/bin/zuul-cloner \ - --cache-dir /opt/git \ - --workspace $TOOLKIT_TMP \ - git://git.openstack.org \ - openstack/openstack-helm-infra - fi - - tools/gate/setup_gate.sh centos-7 - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-fedora-26/post.yaml b/playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-fedora-26/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-fedora-26/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/openstack-helm-infra-aio-basic-ovs-rbd-fedora-26/run.yaml b/playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-fedora-26/run.yaml deleted file mode 100644 index a4c56b72..00000000 --- a/playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-fedora-26/run.yaml +++ /dev/null @@ -1,70 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-openstack-helm-infra-aio-basic-ovs-rbd-fedora-26 - from old job gate-openstack-helm-infra-aio-basic-ovs-rbd-fedora-26-nv - 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 - export INTEGRATION=aio - export INTEGRATION_TYPE=basic - export SUB=-infra - export SDN_PLUGIN=ovs - export GLANCE=rbd - export GATE_ENVIRONMENT=zuul - - TOOLKIT_TMP=$HOME/infra - mkdir -p $TOOLKIT_TMP - - if [ "$SUB" != "-infra" ] ; then - /usr/zuul-env/bin/zuul-cloner \ - --cache-dir /opt/git \ - --workspace $TOOLKIT_TMP \ - git://git.openstack.org \ - openstack/openstack-helm-infra - fi - - tools/gate/setup_gate.sh fedora-26 - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd/post.yaml b/playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd/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/openstack-helm-infra-aio-basic-ovs-rbd/run.yaml b/playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd/run.yaml deleted file mode 100644 index 02d6ea11..00000000 --- a/playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd/run.yaml +++ /dev/null @@ -1,70 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-openstack-helm-infra-aio-basic-ovs-rbd from old job - gate-openstack-helm-infra-aio-basic-ovs-rbd-ubuntu-xenial-nv - 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 - export INTEGRATION=aio - export INTEGRATION_TYPE=basic - export SUB=-infra - export SDN_PLUGIN=ovs - export GLANCE=rbd - export GATE_ENVIRONMENT=zuul - - TOOLKIT_TMP=$HOME/infra - mkdir -p $TOOLKIT_TMP - - if [ "$SUB" != "-infra" ] ; then - /usr/zuul-env/bin/zuul-cloner \ - --cache-dir /opt/git \ - --workspace $TOOLKIT_TMP \ - git://git.openstack.org \ - openstack/openstack-helm-infra - fi - - tools/gate/setup_gate.sh ubuntu-xenial - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/openstack-helm-infra-nocluster-linter-ovs-rbd/post.yaml b/playbooks/legacy/openstack-helm-infra-nocluster-linter-ovs-rbd/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/openstack-helm-infra-nocluster-linter-ovs-rbd/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/openstack-helm-infra-nocluster-linter-ovs-rbd/run.yaml b/playbooks/legacy/openstack-helm-infra-nocluster-linter-ovs-rbd/run.yaml deleted file mode 100644 index fd06f416..00000000 --- a/playbooks/legacy/openstack-helm-infra-nocluster-linter-ovs-rbd/run.yaml +++ /dev/null @@ -1,70 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-openstack-helm-infra-nocluster-linter-ovs-rbd from - old job gate-openstack-helm-infra-nocluster-linter-ovs-rbd-ubuntu-xenial - 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 - export INTEGRATION=nocluster - export INTEGRATION_TYPE=linter - export SUB=-infra - export SDN_PLUGIN=ovs - export GLANCE=rbd - export GATE_ENVIRONMENT=zuul - - TOOLKIT_TMP=$HOME/infra - mkdir -p $TOOLKIT_TMP - - if [ "$SUB" != "-infra" ] ; then - /usr/zuul-env/bin/zuul-cloner \ - --cache-dir /opt/git \ - --workspace $TOOLKIT_TMP \ - git://git.openstack.org \ - openstack/openstack-helm-infra - fi - - tools/gate/setup_gate.sh ubuntu-xenial - 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 f0c672b3..e6afba85 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -3758,36 +3758,6 @@ required-projects: - openstack/openstack-helm-infra -- job: - name: legacy-openstack-helm-infra-aio-basic-ovs-rbd - parent: legacy-base - run: playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd/run.yaml - post-run: playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd/post.yaml - timeout: 6000 - -- job: - name: legacy-openstack-helm-infra-aio-basic-ovs-rbd-centos-7 - parent: legacy-base - run: playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-centos-7/run.yaml - post-run: playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-centos-7/post.yaml - timeout: 6000 - nodeset: legacy-centos-7 - -- job: - name: legacy-openstack-helm-infra-aio-basic-ovs-rbd-fedora-26 - parent: legacy-base - run: playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-fedora-26/run.yaml - post-run: playbooks/legacy/openstack-helm-infra-aio-basic-ovs-rbd-fedora-26/post.yaml - timeout: 6000 - nodeset: legacy-fedora-26 - -- job: - name: legacy-openstack-helm-infra-nocluster-linter-ovs-rbd - parent: legacy-base - run: playbooks/legacy/openstack-helm-infra-nocluster-linter-ovs-rbd/run.yaml - post-run: playbooks/legacy/openstack-helm-infra-nocluster-linter-ovs-rbd/post.yaml - timeout: 6000 - - job: name: legacy-openstack-helm-multi-armada-ovs-rbd-ubuntu-xenial-3-node parent: legacy-base