From c9d0b0f3d03078eea136ad85c8532b1638998676 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 21 Oct 2017 10:54:08 +0200 Subject: [PATCH] Remove legacy oslo.messaging jobs These jobs are all in-tree now, remove them. Change-Id: I476b5f4442088a920895708a8afdb67d4ab5c075 Depends-On: I9d475942e8af340a1b0a276e4a5918426740543c --- .../post.yaml | 15 ----- .../run.yaml | 57 ------------------- .../post.yaml | 15 ----- .../run.yaml | 57 ------------------- .../post.yaml | 15 ----- .../run.yaml | 57 ------------------- .../post.yaml | 15 ----- .../run.yaml | 57 ------------------- zuul.d/zuul-legacy-jobs.yaml | 46 --------------- 9 files changed, 334 deletions(-) delete mode 100644 playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/post.yaml delete mode 100644 playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/run.yaml delete mode 100644 playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-hybrid/post.yaml delete mode 100644 playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-hybrid/run.yaml delete mode 100644 playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default-centos-7/post.yaml delete mode 100644 playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default-centos-7/run.yaml delete mode 100644 playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default/post.yaml delete mode 100644 playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default/run.yaml diff --git a/playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/post.yaml b/playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-dual-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/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/run.yaml b/playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/run.yaml deleted file mode 100644 index 8f161ac8..00000000 --- a/playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/run.yaml +++ /dev/null @@ -1,57 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-oslo.messaging-src-dsvm-full-amqp1-dual-centos-7 - from old job gate-oslo.messaging-src-dsvm-full-amqp1-dual-centos-7-nv - 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 PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS" - export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1" - export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging" - - if [ "amqp1" == "amqp1" ]; then - # The AMQP 1.0 plugin supports a couple of different message bus configurations - # 'hybrid' - use RabbitMQ for Notifications, qdrouterd for RPC - # 'dual' - use qpidd for Notifications, qdrouterd for RPC - # default: use qpidd for Notifications and for RPC - case "dual" in - hybrid) - export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-hybrid" - ;; - dual) - export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-dual" - ;; - esac - fi - - 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/oslo.messaging-src-dsvm-full-amqp1-hybrid/post.yaml b/playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-hybrid/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-hybrid/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/oslo.messaging-src-dsvm-full-amqp1-hybrid/run.yaml b/playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-hybrid/run.yaml deleted file mode 100644 index ab1877f4..00000000 --- a/playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-hybrid/run.yaml +++ /dev/null @@ -1,57 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-oslo.messaging-src-dsvm-full-amqp1-hybrid from old - job gate-oslo.messaging-src-dsvm-full-amqp1-hybrid-ubuntu-xenial-nv - 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 PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS" - export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1" - export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging" - - if [ "amqp1" == "amqp1" ]; then - # The AMQP 1.0 plugin supports a couple of different message bus configurations - # 'hybrid' - use RabbitMQ for Notifications, qdrouterd for RPC - # 'dual' - use qpidd for Notifications, qdrouterd for RPC - # default: use qpidd for Notifications and for RPC - case "hybrid" in - hybrid) - export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-hybrid" - ;; - dual) - export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-dual" - ;; - esac - fi - - 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/oslo.messaging-src-dsvm-full-kafka-default-centos-7/post.yaml b/playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default-centos-7/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default-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/oslo.messaging-src-dsvm-full-kafka-default-centos-7/run.yaml b/playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default-centos-7/run.yaml deleted file mode 100644 index bfe4e741..00000000 --- a/playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default-centos-7/run.yaml +++ /dev/null @@ -1,57 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-oslo.messaging-src-dsvm-full-kafka-default-centos-7 - from old job gate-oslo.messaging-src-dsvm-full-kafka-default-centos-7-nv - 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 PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export PROJECTS="openstack/devstack-plugin-kafka $PROJECTS" - export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-kafka git://git.openstack.org/openstack/devstack-plugin-kafka" - export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging" - - if [ "kafka" == "amqp1" ]; then - # The AMQP 1.0 plugin supports a couple of different message bus configurations - # 'hybrid' - use RabbitMQ for Notifications, qdrouterd for RPC - # 'dual' - use qpidd for Notifications, qdrouterd for RPC - # default: use qpidd for Notifications and for RPC - case "default" in - hybrid) - export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-hybrid" - ;; - dual) - export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-dual" - ;; - esac - fi - - 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/oslo.messaging-src-dsvm-full-kafka-default/post.yaml b/playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default/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/oslo.messaging-src-dsvm-full-kafka-default/run.yaml b/playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default/run.yaml deleted file mode 100644 index 796408b0..00000000 --- a/playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default/run.yaml +++ /dev/null @@ -1,57 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-oslo.messaging-src-dsvm-full-kafka-default from old - job gate-oslo.messaging-src-dsvm-full-kafka-default-ubuntu-xenial-nv - 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 PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export PROJECTS="openstack/devstack-plugin-kafka $PROJECTS" - export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-kafka git://git.openstack.org/openstack/devstack-plugin-kafka" - export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging" - - if [ "kafka" == "amqp1" ]; then - # The AMQP 1.0 plugin supports a couple of different message bus configurations - # 'hybrid' - use RabbitMQ for Notifications, qdrouterd for RPC - # 'dual' - use qpidd for Notifications, qdrouterd for RPC - # default: use qpidd for Notifications and for RPC - case "default" in - hybrid) - export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-hybrid" - ;; - dual) - export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-dual" - ;; - esac - fi - - 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 23cce585..b54f14e5 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -6709,52 +6709,6 @@ - openstack-infra/devstack-gate - openstack/oslo.log -- job: - name: legacy-oslo.messaging-src-dsvm-full-amqp1-dual-centos-7 - parent: legacy-dsvm-base - run: playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/run - post-run: playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/post - timeout: 10800 - nodeset: legacy-centos-7 - required-projects: - - openstack-infra/devstack-gate - - openstack/devstack-plugin-amqp1 - - openstack/oslo.messaging - -- job: - name: legacy-oslo.messaging-src-dsvm-full-amqp1-hybrid - parent: legacy-dsvm-base - run: playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-hybrid/run - post-run: playbooks/legacy/oslo.messaging-src-dsvm-full-amqp1-hybrid/post - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/devstack-plugin-amqp1 - - openstack/oslo.messaging - -- job: - name: legacy-oslo.messaging-src-dsvm-full-kafka-default - parent: legacy-dsvm-base - run: playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default/run - post-run: playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default/post - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/devstack-plugin-kafka - - openstack/oslo.messaging - -- job: - name: legacy-oslo.messaging-src-dsvm-full-kafka-default-centos-7 - parent: legacy-dsvm-base - run: playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default-centos-7/run - post-run: playbooks/legacy/oslo.messaging-src-dsvm-full-kafka-default-centos-7/post - timeout: 10800 - nodeset: legacy-centos-7 - required-projects: - - openstack-infra/devstack-gate - - openstack/devstack-plugin-kafka - - openstack/oslo.messaging - - job: name: legacy-oslo.versionedobjects-src-grenade-dsvm-multinode parent: legacy-dsvm-base-multinode