From 9cdd72c50e3863913e31872b92b51ae3958f98e5 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 18 Oct 2017 20:58:38 +0200
Subject: [PATCH] Remove legacy-grenade-dsvm-ceilometer
Change-Id: Ibf5ce9dbc059b9680f8e554c5d4189f1b2dbb309
Depends-On: I1785b628cdfb743abc87b828f0cd678535266faa
---
.../legacy/grenade-dsvm-ceilometer/post.yaml | 15 -------
.../legacy/grenade-dsvm-ceilometer/run.yaml | 43 -------------------
zuul.d/zuul-legacy-jobs.yaml | 11 -----
3 files changed, 69 deletions(-)
delete mode 100644 playbooks/legacy/grenade-dsvm-ceilometer/post.yaml
delete mode 100644 playbooks/legacy/grenade-dsvm-ceilometer/run.yaml
diff --git a/playbooks/legacy/grenade-dsvm-ceilometer/post.yaml b/playbooks/legacy/grenade-dsvm-ceilometer/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/grenade-dsvm-ceilometer/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/grenade-dsvm-ceilometer/run.yaml b/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml
deleted file mode 100644
index e513564c..00000000
--- a/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-grenade-dsvm-ceilometer from old job gate-grenade-dsvm-ceilometer-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-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 PROJECTS="openstack-dev/grenade $PROJECTS"
- export PYTHONUNBUFFERED=true
- export DEVSTACK_GATE_TEMPEST=1
- export DEVSTACK_GATE_GRENADE=pullup
- export BRANCH_OVERRIDE=default
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
- export GRENADE_PLUGINRC="enable_grenade_plugin ceilometer https://git.openstack.org/openstack/ceilometer"
- 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 419640de..ef52ea0a 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -2289,17 +2289,6 @@
- openstack/barbican-tempest-plugin
- openstack/python-barbicanclient
-- job:
- name: legacy-grenade-dsvm-ceilometer
- parent: legacy-dsvm-base
- run: playbooks/legacy/grenade-dsvm-ceilometer/run
- post-run: playbooks/legacy/grenade-dsvm-ceilometer/post
- timeout: 10800
- required-projects:
- - openstack-dev/grenade
- - openstack-infra/devstack-gate
- - openstack/ceilometer
-
- job:
name: legacy-grenade-dsvm-cinder-mn-sub-bak
parent: legacy-dsvm-base-multinode