From 102f5a55f0d73fe4f17af1d278a1ce4f5c69cf78 Mon Sep 17 00:00:00 2001
From: Ruby Loo <ruby.loo@intel.com>
Date: Tue, 31 Oct 2017 17:22:17 -0400
Subject: [PATCH] Remove legacy python-ironic-inspector-client jobs
The legacy python-ironic-inspector-client jobs have been moved to
the python-ironic-inspector-client repo. This patch removes them
from this repo.
Depends-On: I0f82251dc785d56a99de1a43d2ce910bf63ee125
Change-Id: Ib5c29b7c77e787b592862d771517d9a357a07f22
---
.../post.yaml | 67 ------
.../run.yaml | 87 --------
.../post.yaml | 15 --
.../run.yaml | 205 ------------------
zuul.d/zuul-legacy-jobs.yaml | 27 ---
5 files changed, 401 deletions(-)
delete mode 100644 playbooks/legacy/python-ironic-inspector-client-tox-func/post.yaml
delete mode 100644 playbooks/legacy/python-ironic-inspector-client-tox-func/run.yaml
delete mode 100644 playbooks/legacy/tempest-dsvm-python-ironic-inspector-client/post.yaml
delete mode 100644 playbooks/legacy/tempest-dsvm-python-ironic-inspector-client/run.yaml
diff --git a/playbooks/legacy/python-ironic-inspector-client-tox-func/post.yaml b/playbooks/legacy/python-ironic-inspector-client-tox-func/post.yaml
deleted file mode 100644
index 68fbdf81..00000000
--- a/playbooks/legacy/python-ironic-inspector-client-tox-func/post.yaml
+++ /dev/null
@@ -1,67 +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
diff --git a/playbooks/legacy/python-ironic-inspector-client-tox-func/run.yaml b/playbooks/legacy/python-ironic-inspector-client-tox-func/run.yaml
deleted file mode 100644
index 542916a8..00000000
--- a/playbooks/legacy/python-ironic-inspector-client-tox-func/run.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-python-ironic-inspector-client-tox-func from old
- job gate-python-ironic-inspector-client-tox-func-ubuntu-xenial
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - shell:
- cmd: |
- set -e
- set -x
- CLONEMAP=`mktemp`
- REQS_DIR=`mktemp -d`
- function cleanup {
- mkdir -p $WORKSPACE
- rm -rf $CLONEMAP $REQS_DIR
- }
- trap cleanup EXIT
- cat > $CLONEMAP << EOF
- clonemap:
- - name: $ZUUL_PROJECT
- dest: .
- EOF
- # zuul cloner works poorly if there are 2 names that are the
- # same in here.
- if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
- cat >> $CLONEMAP << EOF
- - name: openstack/requirements
- dest: $REQS_DIR
- EOF
- fi
- /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
- git://git.openstack.org $ZUUL_PROJECT openstack/requirements
- # REQS_DIR is not set for openstack/requirements and there is also
- # no need to copy in this case.
- if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
- cp $REQS_DIR/upper-constraints.txt ./
- fi
- 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: |
- if [ -x tools/test-setup.sh ] ; then
- tools/test-setup.sh
- fi
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -x
- sudo rm -f /etc/sudoers.d/zuul
- # Prove that general sudo access is actually revoked
- ! sudo -n true
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: /usr/local/jenkins/slave_scripts/run-tox.sh func
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- OUT=`git ls-files --other --exclude-standard --directory`
- if [ -z "$OUT" ]; then
- echo "No extra files created during test."
- exit 0
- else
- echo "The following un-ignored files were created during the test:"
- echo "$OUT"
- exit 0 # TODO: change to 1 to fail tests.
- fi
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/tempest-dsvm-python-ironic-inspector-client/post.yaml b/playbooks/legacy/tempest-dsvm-python-ironic-inspector-client/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-dsvm-python-ironic-inspector-client/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/tempest-dsvm-python-ironic-inspector-client/run.yaml b/playbooks/legacy/tempest-dsvm-python-ironic-inspector-client/run.yaml
deleted file mode 100644
index a2ee0aca..00000000
--- a/playbooks/legacy/tempest-dsvm-python-ironic-inspector-client/run.yaml
+++ /dev/null
@@ -1,205 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-tempest-dsvm-python-ironic-inspector-client from
- old job gate-tempest-dsvm-python-ironic-inspector-client-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: |
- cat << 'EOF' >> ironic-extra-vars
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER_ISCSI_WITH_IPA=True"
- # Standardize VM size for each supported ramdisk
- case "tinyipa" in
- 'tinyipa')
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
- ;;
- 'tinyipa256')
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=256"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
- ;;
- 'coreos')
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=1280"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=coreos"
- ;;
- # if using a ramdisk without a known good value, use the devstack
- # default by not exporting any value for IRONIC_VM_SPECS_RAM
- esac
-
- EOF
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- cat << 'EOF' >> ironic-extra-vars
- export DEVSTACK_GATE_TEMPEST_REGEX="InspectorSmokeTest"
-
- EOF
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- cat << 'EOF' >> ironic-extra-vars
- export PROJECTS="openstack/ironic-inspector $PROJECTS"
- export PROJECTS="openstack/python-ironic-inspector-client $PROJECTS"
- export DEVSTACK_GATE_IRONIC_INSPECTOR=1
-
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector"
-
- # use tempest plugin
- if [[ "$ZUUL_BRANCH" != "master" ]] ; then
- # NOTE(jroll) if this is not a patch against master, then
- # fetch master to install the plugin
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic-inspector'"
- else
- # on master, use the local change, so we can pick up any changes to the plugin
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-inspector'"
- fi
-
- export IRONIC_INSPECTOR_AUTO_DISCOVERY=0
- if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then
- # discovery test requires sudo for iptables and virsh
- export DEVSTACK_GATE_REMOVE_STACK_SUDO=0
- # enable enroll hook
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK=enroll"
- # we are deleting node from ironic for simulate node discovery,
- # so inspector has to sync cache asap
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_CLEAN_UP_PERIOD=5"
- fi
-
- # Make IPXE configuration consistent between Mitaka and Master
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_IPXE_ENABLED=True"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_RAMDISK_ELEMENT=ironic-agent"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_MANAGE_FIREWALL=True"
-
- EOF
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- cat << 'EOF' >> ironic-extra-vars
- export DEVSTACK_PROJECT_FROM_GIT="python-ironic-inspector-client,$DEVSTACK_PROJECT_FROM_GIT"
-
- EOF
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- cat << 'EOF' >> ironic-vars-early
- # use tempest plugin
- if [[ "$ZUUL_BRANCH" != "master" ]] ; then
- # NOTE(jroll) if this is not a patch against master, then
- # fetch master to install the plugin
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'"
- else
- # on master, use the local change, so we can pick up any changes to the plugin
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic'"
- fi
- export TEMPEST_CONCURRENCY=1
-
- EOF
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- export PROJECTS="openstack/ironic $PROJECTS"
- export PROJECTS="openstack/ironic-lib $PROJECTS"
- export PROJECTS="openstack/ironic-python-agent $PROJECTS"
- export PROJECTS="openstack/python-ironicclient $PROJECTS"
- export PROJECTS="openstack/pyghmi $PROJECTS"
- export PROJECTS="openstack/virtualbmc $PROJECTS"
- export PYTHONUNBUFFERED=true
- export DEVSTACK_GATE_TEMPEST=1
- export DEVSTACK_GATE_IRONIC=1
- export DEVSTACK_GATE_NEUTRON=1
- export DEVSTACK_GATE_VIRT_DRIVER=ironic
- export DEVSTACK_GATE_CONFIGDRIVE=1
- export DEVSTACK_GATE_IRONIC_DRIVER=agent_ipmitool
- export BRANCH_OVERRIDE=default
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
-
- if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
- export DEVSTACK_GATE_TLSPROXY=1
- fi
-
- if [ "agent_ipmitool" == "pxe_snmp" ] ; then
- # explicitly enable pxe_snmp driver
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_DRIVERS=fake,pxe_snmp"
- fi
-
- if [ "agent_ipmitool" == "redfish" ] ; then
- # When deploying with redfish we need to enable the "redfish"
- # hardware type
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_HARDWARE_TYPES=redfish"
- fi
-
- if [ "wholedisk" == "wholedisk" ] ; then
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=True"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=0"
- else
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=False"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=1"
- fi
-
- if [ -n "" ] ; then
- export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=1
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=True"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"USE_SUBNETPOOL=False"
- else
- export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=0
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=False"
- fi
-
- if [ "bios" == "uefi" ] ; then
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BOOT_MODE=uefi"
- fi
-
- export DEVSTACK_PROJECT_FROM_GIT=""
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=1"
-
- # Ensure the ironic-vars-EARLY file exists
- touch ironic-vars-early
- # Pull in the EARLY variables injected by the optional builders
- source ironic-vars-early
-
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic"
-
- # Ensure the ironic-EXTRA-vars file exists
- touch ironic-extra-vars
- # Pull in the EXTRA variables injected by the optional builders
- source ironic-extra-vars
-
- 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 7c1b058c..3fa9bf2b 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -5649,15 +5649,6 @@
- openstack/barbican-tempest-plugin
- openstack/python-barbicanclient
-- job:
- name: legacy-python-ironic-inspector-client-tox-func
- parent: legacy-base
- run: playbooks/legacy/python-ironic-inspector-client-tox-func/run.yaml
- post-run: playbooks/legacy/python-ironic-inspector-client-tox-func/post.yaml
- timeout: 2400
- required-projects:
- - openstack/requirements
-
- job:
name: legacy-python-mistralclient-devstack-dsvm
parent: legacy-dsvm-base
@@ -8926,24 +8917,6 @@
- openstack/devstack-plugin-ceph
- openstack/tempest
-- job:
- name: legacy-tempest-dsvm-python-ironic-inspector-client
- parent: legacy-dsvm-base
- run: playbooks/legacy/tempest-dsvm-python-ironic-inspector-client/run.yaml
- post-run: playbooks/legacy/tempest-dsvm-python-ironic-inspector-client/post.yaml
- timeout: 10800
- required-projects:
- - openstack-infra/devstack-gate
- - openstack/ironic
- - openstack/ironic-inspector
- - openstack/ironic-lib
- - openstack/ironic-python-agent
- - openstack/pyghmi
- - openstack/python-ironic-inspector-client
- - openstack/python-ironicclient
- - openstack/tempest
- - openstack/virtualbmc
-
- job:
name: legacy-tempest-dsvm-python-ironicclient-src
parent: legacy-dsvm-base