From 0b351ea36126c5bdd092d7ba76169d5317d81d5e Mon Sep 17 00:00:00 2001
From: Brian Rosmaita <rosmaita.fossdev@gmail.com>
Date: Sun, 10 Dec 2017 16:38:48 -0500
Subject: [PATCH] Remove glance_store legacy jobs
Depends-On: I2a5ff2ee29e2fb8a730406f9f0e6a450b96c85b8
Change-Id: I96600383c072e6d2926f5ff5b6a51057e53d35fd
---
.../post.yaml | 80 -------------------
.../run.yaml | 55 -------------
.../post.yaml | 80 -------------------
.../run.yaml | 55 -------------
.../post.yaml | 80 -------------------
.../run.yaml | 54 -------------
zuul.d/zuul-legacy-jobs.yaml | 35 --------
7 files changed, 439 deletions(-)
delete mode 100644 playbooks/legacy/glance_store-dsvm-functional-cinder/post.yaml
delete mode 100644 playbooks/legacy/glance_store-dsvm-functional-cinder/run.yaml
delete mode 100644 playbooks/legacy/glance_store-dsvm-functional-filesystem/post.yaml
delete mode 100644 playbooks/legacy/glance_store-dsvm-functional-filesystem/run.yaml
delete mode 100644 playbooks/legacy/glance_store-dsvm-functional-swift/post.yaml
delete mode 100644 playbooks/legacy/glance_store-dsvm-functional-swift/run.yaml
diff --git a/playbooks/legacy/glance_store-dsvm-functional-cinder/post.yaml b/playbooks/legacy/glance_store-dsvm-functional-cinder/post.yaml
deleted file mode 100644
index dac87534..00000000
--- a/playbooks/legacy/glance_store-dsvm-functional-cinder/post.yaml
+++ /dev/null
@@ -1,80 +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=**/*nose_results.html
- - --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=**/*testr_results.html.gz
- - --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=/.testrepository/tmp*
- - --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=**/*testrepository.subunit.gz
- - --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 }}/tox'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=/.tox/*/log/*
- - --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/glance_store-dsvm-functional-cinder/run.yaml b/playbooks/legacy/glance_store-dsvm-functional-cinder/run.yaml
deleted file mode 100644
index af151334..00000000
--- a/playbooks/legacy/glance_store-dsvm-functional-cinder/run.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-glance_store-dsvm-functional-cinder from old job
- gate-glance_store-dsvm-functional-cinder-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 ENABLED_SERVICES=g-api,n-api
- export BRANCH_OVERRIDE=default
- export DEVSTACK_PROJECT_FROM_GIT=glance_store
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
-
- function gate_hook {
- cd $BASE/new/glance_store/glance_store/tests/functional/hooks
- ./gate_hook.sh cinder
- }
- export -f gate_hook
-
- function post_test_hook {
- cd $BASE/new/glance_store/glance_store/tests/functional/hooks
- ./post_test_hook.sh cinder
- }
- 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/legacy/glance_store-dsvm-functional-filesystem/post.yaml b/playbooks/legacy/glance_store-dsvm-functional-filesystem/post.yaml
deleted file mode 100644
index dac87534..00000000
--- a/playbooks/legacy/glance_store-dsvm-functional-filesystem/post.yaml
+++ /dev/null
@@ -1,80 +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=**/*nose_results.html
- - --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=**/*testr_results.html.gz
- - --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=/.testrepository/tmp*
- - --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=**/*testrepository.subunit.gz
- - --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 }}/tox'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=/.tox/*/log/*
- - --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/glance_store-dsvm-functional-filesystem/run.yaml b/playbooks/legacy/glance_store-dsvm-functional-filesystem/run.yaml
deleted file mode 100644
index 0d45cb75..00000000
--- a/playbooks/legacy/glance_store-dsvm-functional-filesystem/run.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-glance_store-dsvm-functional-filesystem from old
- job gate-glance_store-dsvm-functional-filesystem-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 ENABLED_SERVICES=g-api,n-api
- export BRANCH_OVERRIDE=default
- export DEVSTACK_PROJECT_FROM_GIT=glance_store
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
-
- function gate_hook {
- cd $BASE/new/glance_store/glance_store/tests/functional/hooks
- ./gate_hook.sh filesystem
- }
- export -f gate_hook
-
- function post_test_hook {
- cd $BASE/new/glance_store/glance_store/tests/functional/hooks
- ./post_test_hook.sh filesystem
- }
- 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/legacy/glance_store-dsvm-functional-swift/post.yaml b/playbooks/legacy/glance_store-dsvm-functional-swift/post.yaml
deleted file mode 100644
index dac87534..00000000
--- a/playbooks/legacy/glance_store-dsvm-functional-swift/post.yaml
+++ /dev/null
@@ -1,80 +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=**/*nose_results.html
- - --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=**/*testr_results.html.gz
- - --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=/.testrepository/tmp*
- - --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=**/*testrepository.subunit.gz
- - --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 }}/tox'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=/.tox/*/log/*
- - --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/glance_store-dsvm-functional-swift/run.yaml b/playbooks/legacy/glance_store-dsvm-functional-swift/run.yaml
deleted file mode 100644
index 4746147a..00000000
--- a/playbooks/legacy/glance_store-dsvm-functional-swift/run.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-glance_store-dsvm-functional-swift from old job gate-glance_store-dsvm-functional-swift-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 ENABLED_SERVICES=g-api,n-api
- export BRANCH_OVERRIDE=default
- export DEVSTACK_PROJECT_FROM_GIT=glance_store
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
-
- function gate_hook {
- cd $BASE/new/glance_store/glance_store/tests/functional/hooks
- ./gate_hook.sh swift
- }
- export -f gate_hook
-
- function post_test_hook {
- cd $BASE/new/glance_store/glance_store/tests/functional/hooks
- ./post_test_hook.sh swift
- }
- 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/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml
index b5590b9d..3c38a940 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -562,41 +562,6 @@
- openstack/glance
nodeset: legacy-ubuntu-xenial-2-node
-- job:
- name: legacy-glance_store-dsvm-functional-cinder
- parent: legacy-dsvm-base
- run: playbooks/legacy/glance_store-dsvm-functional-cinder/run.yaml
- post-run: playbooks/legacy/glance_store-dsvm-functional-cinder/post.yaml
- timeout: 4200
- required-projects:
- - openstack-infra/devstack-gate
- - openstack/cinder
- - openstack/glance
- - openstack/glance_store
-
-- job:
- name: legacy-glance_store-dsvm-functional-filesystem
- parent: legacy-dsvm-base
- run: playbooks/legacy/glance_store-dsvm-functional-filesystem/run.yaml
- post-run: playbooks/legacy/glance_store-dsvm-functional-filesystem/post.yaml
- timeout: 4200
- required-projects:
- - openstack-infra/devstack-gate
- - openstack/glance
- - openstack/glance_store
-
-- job:
- name: legacy-glance_store-dsvm-functional-swift
- parent: legacy-dsvm-base
- run: playbooks/legacy/glance_store-dsvm-functional-swift/run.yaml
- post-run: playbooks/legacy/glance_store-dsvm-functional-swift/post.yaml
- timeout: 4200
- required-projects:
- - openstack-infra/devstack-gate
- - openstack/glance
- - openstack/glance_store
- - openstack/swift
-
- job:
name: legacy-glare-dsvm
parent: legacy-dsvm-base