summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-12-19 12:40:28 +0000
committerGerrit Code Review <review@openstack.org>2019-12-19 12:40:28 +0000
commit4fc0e6241b148c29bc937a6bb2c26fa6775ede89 (patch)
tree34c68eff30a88c9654c56c74e4210f637a01f711
parent4e49a286e7da174d2e778c030d4ed2dba1218d3f (diff)
parent1057cfc60f7df8c26ee31b9cb6132c3cbf444a63 (diff)
downloadoslo-messaging-4fc0e6241b148c29bc937a6bb2c26fa6775ede89.tar.gz
Merge "Remove telemetry checks"
-rw-r--r--.zuul.yaml72
-rw-r--r--playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml59
-rw-r--r--playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml58
-rw-r--r--playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml56
4 files changed, 0 insertions, 245 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 2c8972f..2c4b0ed 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -147,71 +147,6 @@
nodeset: legacy-ubuntu-xenial-2-node
-- job:
- name: oslo.messaging-telemetry-dsvm-integration-amqp1
- parent: legacy-dsvm-base
- run: playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml
- post-run: playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/post.yaml
- timeout: 10800
- required-projects:
- - openstack/devstack-gate
- - openstack/aodh
- - openstack/ceilometer
- - openstack/devstack-plugin-amqp1
- - openstack/oslo.messaging
- - openstack/panko
- - openstack/telemetry-tempest-plugin
- - openstack/heat-tempest-plugin
- - openstack/heat
- # following are required when DEVSTACK_GATE_HEAT, which this
- # job turns on
- - openstack/dib-utils
- - openstack/diskimage-builder
-
-
-- job:
- name: oslo.messaging-telemetry-dsvm-integration-kafka
- parent: legacy-dsvm-base
- run: playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml
- post-run: playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/post.yaml
- timeout: 10800
- required-projects:
- - openstack/devstack-gate
- - openstack/aodh
- - openstack/ceilometer
- - openstack/devstack-plugin-kafka
- - openstack/oslo.messaging
- - openstack/panko
- - openstack/telemetry-tempest-plugin
- - openstack/heat-tempest-plugin
- - openstack/heat
- # following are required when DEVSTACK_GATE_HEAT, which this
- # job turns on
- - openstack/dib-utils
- - openstack/diskimage-builder
-
-
-- job:
- name: oslo.messaging-telemetry-dsvm-integration-rabbit
- parent: legacy-dsvm-base
- run: playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml
- post-run: playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/post.yaml
- timeout: 10800
- required-projects:
- - openstack/devstack-gate
- - openstack/aodh
- - openstack/ceilometer
- - openstack/oslo.messaging
- - openstack/panko
- - openstack/telemetry-tempest-plugin
- - openstack/heat-tempest-plugin
- - openstack/heat
- # following are required when DEVSTACK_GATE_HEAT, which this
- # job turns on
- - openstack/dib-utils
- - openstack/diskimage-builder
-
-
- project:
templates:
- check-requirements
@@ -253,13 +188,6 @@
- oslo.messaging-src-grenade-dsvm-multinode:
voting: false
- - oslo.messaging-telemetry-dsvm-integration-rabbit:
- voting: false
- - oslo.messaging-telemetry-dsvm-integration-amqp1:
- voting: false
- - oslo.messaging-telemetry-dsvm-integration-kafka:
- voting: false
-
gate:
jobs:
- oslo.messaging-tox-py27-func-rabbit
diff --git a/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml b/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml
deleted file mode 100644
index 82160ca..0000000
--- a/playbooks/oslo.messaging-telemetry-dsvm-integration-amqp1/run.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-oslo.messaging-telemetry-dsvm-integration-amqp1 from
- old job gate-oslo.messaging-telemetry-dsvm-integration-amqp1-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/devstack-gate
- dest: devstack-gate
- EOF
- /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
- https://opendev.org \
- openstack/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_HEAT=1
- export DEVSTACK_GATE_NEUTRON=1
- export DEVSTACK_GATE_TEMPEST=1
- export DEVSTACK_GATE_INSTALL_TESTONLY=1
- export DEVSTACK_GATE_TEMPEST_NOTESTS=1
- export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko openstack/telemetry-tempest-plugin openstack/heat openstack/heat-tempest-plugin"
- export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko https://opendev.org/openstack/panko"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://opendev.org/openstack/ceilometer"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh https://opendev.org/openstack/aodh"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat https://opendev.org/openstack/heat"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"INSTALL_TEMPEST=False"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=15"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-hybrid"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 https://opendev.org/openstack/devstack-plugin-amqp1"
- export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME
- function post_test_hook {
- cd /opt/stack/new/telemetry-tempest-plugin/playbooks/legacy/telemetry-dsvm-integration-tempest-plugin
- ./post_test_hook.sh
- }
- export -f post_test_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/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml b/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml
deleted file mode 100644
index 39a2ad9..0000000
--- a/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-oslo.messaging-telemetry-dsvm-integration-kafka from
- old job gate-oslo.messaging-telemetry-dsvm-integration-kafka-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/devstack-gate
- dest: devstack-gate
- EOF
- /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
- https://opendev.org \
- openstack/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_HEAT=1
- export DEVSTACK_GATE_NEUTRON=1
- export DEVSTACK_GATE_TEMPEST=1
- export DEVSTACK_GATE_INSTALL_TESTONLY=1
- export DEVSTACK_GATE_TEMPEST_NOTESTS=1
- export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko openstack/telemetry-tempest-plugin openstack/heat openstack/heat-tempest-plugin"
- export PROJECTS="openstack/devstack-plugin-kafka $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko https://opendev.org/openstack/panko"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://opendev.org/openstack/ceilometer"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh https://opendev.org/openstack/aodh"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat https://opendev.org/openstack/heat"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"INSTALL_TEMPEST=False"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=15"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-kafka https://opendev.org/openstack/devstack-plugin-kafka"
- export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME
- function post_test_hook {
- cd /opt/stack/new/telemetry-tempest-plugin/playbooks/legacy/telemetry-dsvm-integration-tempest-plugin
- ./post_test_hook.sh
- }
- export -f post_test_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/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml b/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml
deleted file mode 100644
index e9e7b3f..0000000
--- a/playbooks/oslo.messaging-telemetry-dsvm-integration-rabbit/run.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-telemetry-dsvm-integration-oslo.messaging from old
- job gate-telemetry-dsvm-integration-oslo.messaging-ubuntu-xenial
- 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/devstack-gate
- dest: devstack-gate
- EOF
- /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
- https://opendev.org \
- openstack/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_HEAT=1
- export DEVSTACK_GATE_NEUTRON=1
- export DEVSTACK_GATE_TEMPEST=1
- export DEVSTACK_GATE_INSTALL_TESTONLY=1
- export DEVSTACK_GATE_TEMPEST_NOTESTS=1
- export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko openstack/telemetry-tempest-plugin openstack/heat-tempest-plugin"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko https://opendev.org/openstack/panko"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://opendev.org/openstack/ceilometer"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh https://opendev.org/openstack/aodh"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat https://opendev.org/openstack/heat"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"INSTALL_TEMPEST=False"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=15"
- export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME
- function post_test_hook {
- cd /opt/stack/new/telemetry-tempest-plugin/playbooks/legacy/telemetry-dsvm-integration-tempest-plugin
- ./post_test_hook.sh
- }
- export -f post_test_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 }}'