summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn L. Villalovos <john.l.villalovos@intel.com>2017-11-08 10:36:27 -0800
committerJohn L. Villalovos <john.l.villalovos@intel.com>2017-11-08 10:55:11 -0800
commit47179d9fca337f32324f8e8a68541358fdac8649 (patch)
treea697c6df7bd890c07f259811df8e631de6cf27df
parentc163e78629eac4e696ae62dc9a29a0fc77ca463f (diff)
Remove experimental jobs and sort job definitions in project.yamlstable/pike
Remove the experimental jobs as they are not used in stable/pike Remove the non-voting job: tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-python3 as we did not get Python 3 support working in the Pike cycle. Sort the job definitions in in project.yaml to make it easier to compare and view. Move non-voting jobs to end of list. Delete unused playbooks due to deleting experimental jobs and the Python 3 job. Change-Id: Ia5c004bfde752f17d02ed784bd34cd9a60b6ff71
Notes
Notes (review): Code-Review+2: Dmitry Tantsur <divius.inside@gmail.com> Code-Review+2: Ruby Loo <ruby.loo@intel.com> Workflow+1: Ruby Loo <ruby.loo@intel.com> Code-Review+1: Debo Zhang <zhangdebo@inspur.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 10 Nov 2017 19:38:15 +0000 Reviewed-on: https://review.openstack.org/518600 Project: openstack/ironic Branch: refs/heads/stable/pike
-rw-r--r--playbooks/legacy/ironic-dsvm-functional/post.yaml15
-rw-r--r--playbooks/legacy/ironic-dsvm-functional/run.yaml63
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-python3/post.yaml15
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-python3/run.yaml182
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-ipa-resourceclasses-partition-pxe_ipmitool-tinyipa/post.yaml15
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-ipa-resourceclasses-partition-pxe_ipmitool-tinyipa/run.yaml166
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/post.yaml15
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/run.yaml156
-rw-r--r--zuul.d/legacy-ironic-jobs.yaml32
-rw-r--r--zuul.d/project.yaml40
10 files changed, 16 insertions, 683 deletions
diff --git a/playbooks/legacy/ironic-dsvm-functional/post.yaml b/playbooks/legacy/ironic-dsvm-functional/post.yaml
deleted file mode 100644
index e07f551..0000000
--- a/playbooks/legacy/ironic-dsvm-functional/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
1- hosts: primary
2 tasks:
3
4 - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
5 synchronize:
6 src: '{{ ansible_user_dir }}/workspace/'
7 dest: '{{ zuul.executor.log_root }}'
8 mode: pull
9 copy_links: true
10 verify_host: true
11 rsync_opts:
12 - --include=/logs/**
13 - --include=*/
14 - --exclude=*
15 - --prune-empty-dirs
diff --git a/playbooks/legacy/ironic-dsvm-functional/run.yaml b/playbooks/legacy/ironic-dsvm-functional/run.yaml
deleted file mode 100644
index 737281d..0000000
--- a/playbooks/legacy/ironic-dsvm-functional/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
1- hosts: all
2 name: Autoconverted job legacy-ironic-dsvm-functional from old job gate-ironic-dsvm-functional-ubuntu-xenial
3 tasks:
4
5 - name: Ensure legacy workspace directory
6 file:
7 path: '{{ ansible_user_dir }}/workspace'
8 state: directory
9
10 - shell:
11 cmd: |
12 set -e
13 set -x
14 cat > clonemap.yaml << EOF
15 clonemap:
16 - name: openstack-infra/devstack-gate
17 dest: devstack-gate
18 EOF
19 /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
20 git://git.openstack.org \
21 openstack-infra/devstack-gate
22 executable: /bin/bash
23 chdir: '{{ ansible_user_dir }}/workspace'
24 environment: '{{ zuul | zuul_legacy_vars }}'
25
26 - shell:
27 cmd: |
28 set -e
29 set -x
30 cat << 'EOF' >>"/tmp/dg-local.conf"
31 [[local|localrc]]
32 enable_plugin ironic git://git.openstack.org/openstack/ironic
33
34 EOF
35 executable: /bin/bash
36 chdir: '{{ ansible_user_dir }}/workspace'
37 environment: '{{ zuul | zuul_legacy_vars }}'
38
39 - shell:
40 cmd: |
41 set -e
42 set -x
43 export PYTHONUNBUFFERED=true
44 export DEVSTACK_GATE_TEMPEST=1
45 export DEVSTACK_GATE_IRONIC=1
46 export DEVSTACK_GATE_NEUTRON=1
47 export DEVSTACK_GATE_VIRT_DRIVER=ironic
48 export TEMPEST_CONCURRENCY=2
49 export BRANCH_OVERRIDE=default
50 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
51 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
52 fi
53 export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
54 export DEVSTACK_GATE_TEMPEST_REGEX='ironic'
55 export PROJECTS="openstack/ironic $PROJECTS"
56 export PROJECTS="openstack/ironic-python-agent $PROJECTS"
57
58 # No post_test_hook is needed while tests live in tempest
59 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
60 ./safe-devstack-vm-gate-wrap.sh
61 executable: /bin/bash
62 chdir: '{{ ansible_user_dir }}/workspace'
63 environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-python3/post.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-python3/post.yaml
deleted file mode 100644
index e07f551..0000000
--- a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-python3/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
1- hosts: primary
2 tasks:
3
4 - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
5 synchronize:
6 src: '{{ ansible_user_dir }}/workspace/'
7 dest: '{{ zuul.executor.log_root }}'
8 mode: pull
9 copy_links: true
10 verify_host: true
11 rsync_opts:
12 - --include=/logs/**
13 - --include=*/
14 - --exclude=*
15 - --prune-empty-dirs
diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-python3/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-python3/run.yaml
deleted file mode 100644
index 3d17b14..0000000
--- a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-python3/run.yaml
+++ /dev/null
@@ -1,182 +0,0 @@
1- hosts: all
2 name: Autoconverted job legacy-tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-python3
3 from old job gate-tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-python3-ubuntu-xenial-nv
4 tasks:
5
6 - name: Ensure legacy workspace directory
7 file:
8 path: '{{ ansible_user_dir }}/workspace'
9 state: directory
10
11 - shell:
12 cmd: |
13 set -e
14 set -x
15 cat > clonemap.yaml << EOF
16 clonemap:
17 - name: openstack-infra/devstack-gate
18 dest: devstack-gate
19 EOF
20 /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
21 git://git.openstack.org \
22 openstack-infra/devstack-gate
23 executable: /bin/bash
24 chdir: '{{ ansible_user_dir }}/workspace'
25 environment: '{{ zuul | zuul_legacy_vars }}'
26
27 - shell:
28 cmd: |
29 cat << 'EOF' >> ironic-extra-vars
30 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER_ISCSI_WITH_IPA=True"
31 # Standardize VM size for each supported ramdisk
32 case "tinyipa" in
33 'tinyipa')
34 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384"
35 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
36 ;;
37 'tinyipa256')
38 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=256"
39 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
40 ;;
41 'coreos')
42 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=1280"
43 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=coreos"
44 ;;
45 # if using a ramdisk without a known good value, use the devstack
46 # default by not exporting any value for IRONIC_VM_SPECS_RAM
47 esac
48
49 EOF
50 chdir: '{{ ansible_user_dir }}/workspace'
51 environment: '{{ zuul | zuul_legacy_vars }}'
52
53 - shell:
54 cmd: |
55 cat << 'EOF' >> ironic-extra-vars
56 export DEVSTACK_GATE_TEMPEST_REGEX="ironic"
57
58 EOF
59 chdir: '{{ ansible_user_dir }}/workspace'
60 environment: '{{ zuul | zuul_legacy_vars }}'
61
62 - shell:
63 cmd: |
64 cat << 'EOF' >> ironic-vars-early
65 # use tempest plugin
66 if [[ "$ZUUL_BRANCH" != "master" ]] ; then
67 # NOTE(jroll) if this is not a patch against master, then
68 # fetch master to install the plugin
69 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'"
70 else
71 # on master, use the local change, so we can pick up any changes to the plugin
72 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic'"
73 fi
74 export TEMPEST_CONCURRENCY=1
75
76 EOF
77 chdir: '{{ ansible_user_dir }}/workspace'
78 environment: '{{ zuul | zuul_legacy_vars }}'
79
80 - shell:
81 cmd: |
82 cat << 'EOF' >> ironic-extra-vars
83 export DEVSTACK_GATE_USE_PYTHON3=True
84
85 EOF
86 chdir: '{{ ansible_user_dir }}/workspace'
87 environment: '{{ zuul | zuul_legacy_vars }}'
88
89 - shell:
90 cmd: |
91 set -e
92 set -x
93 cat << 'EOF' >>"/tmp/dg-local.conf"
94 [[local|localrc]]
95 disable_service s-account
96 disable_service s-container
97 disable_service s-object
98 disable_service s-proxy
99
100 EOF
101 executable: /bin/bash
102 chdir: '{{ ansible_user_dir }}/workspace'
103 environment: '{{ zuul | zuul_legacy_vars }}'
104
105 - shell:
106 cmd: |
107 set -e
108 set -x
109 export PROJECTS="openstack/ironic $PROJECTS"
110 export PROJECTS="openstack/ironic-lib $PROJECTS"
111 export PROJECTS="openstack/ironic-python-agent $PROJECTS"
112 export PROJECTS="openstack/python-ironicclient $PROJECTS"
113 export PROJECTS="openstack/pyghmi $PROJECTS"
114 export PROJECTS="openstack/virtualbmc $PROJECTS"
115 export PYTHONUNBUFFERED=true
116 export DEVSTACK_GATE_TEMPEST=1
117 export DEVSTACK_GATE_IRONIC=1
118 export DEVSTACK_GATE_NEUTRON=1
119 export DEVSTACK_GATE_VIRT_DRIVER=ironic
120 export DEVSTACK_GATE_CONFIGDRIVE=1
121 export DEVSTACK_GATE_IRONIC_DRIVER=pxe_ipmitool
122 export BRANCH_OVERRIDE=default
123 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
124 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
125 fi
126
127 if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
128 export DEVSTACK_GATE_TLSPROXY=1
129 fi
130
131 if [ "pxe_ipmitool" == "pxe_snmp" ] ; then
132 # explicitly enable pxe_snmp driver
133 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_DRIVERS=fake,pxe_snmp"
134 fi
135
136 if [ "pxe_ipmitool" == "redfish" ] ; then
137 # When deploying with redfish we need to enable the "redfish"
138 # hardware type
139 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_HARDWARE_TYPES=redfish"
140 fi
141
142 if [ "wholedisk" == "wholedisk" ] ; then
143 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=True"
144 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=0"
145 else
146 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=False"
147 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=1"
148 fi
149
150 if [ -n "" ] ; then
151 export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=1
152 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=True"
153 export DEVSTACK_LOCAL_CONFIG+=$'\n'"USE_SUBNETPOOL=False"
154 else
155 export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=0
156 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=False"
157 fi
158
159 if [ "bios" == "uefi" ] ; then
160 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BOOT_MODE=uefi"
161 fi
162
163 export DEVSTACK_PROJECT_FROM_GIT=""
164 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=1"
165
166 # Ensure the ironic-vars-EARLY file exists
167 touch ironic-vars-early
168 # Pull in the EARLY variables injected by the optional builders
169 source ironic-vars-early
170
171 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic"
172
173 # Ensure the ironic-EXTRA-vars file exists
174 touch ironic-extra-vars
175 # Pull in the EXTRA variables injected by the optional builders
176 source ironic-extra-vars
177
178 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
179 ./safe-devstack-vm-gate-wrap.sh
180 executable: /bin/bash
181 chdir: '{{ ansible_user_dir }}/workspace'
182 environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-resourceclasses-partition-pxe_ipmitool-tinyipa/post.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-resourceclasses-partition-pxe_ipmitool-tinyipa/post.yaml
deleted file mode 100644
index e07f551..0000000
--- a/playbooks/legacy/tempest-dsvm-ironic-ipa-resourceclasses-partition-pxe_ipmitool-tinyipa/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
1- hosts: primary
2 tasks:
3
4 - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
5 synchronize:
6 src: '{{ ansible_user_dir }}/workspace/'
7 dest: '{{ zuul.executor.log_root }}'
8 mode: pull
9 copy_links: true
10 verify_host: true
11 rsync_opts:
12 - --include=/logs/**
13 - --include=*/
14 - --exclude=*
15 - --prune-empty-dirs
diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-resourceclasses-partition-pxe_ipmitool-tinyipa/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-resourceclasses-partition-pxe_ipmitool-tinyipa/run.yaml
deleted file mode 100644
index 64e9700..0000000
--- a/playbooks/legacy/tempest-dsvm-ironic-ipa-resourceclasses-partition-pxe_ipmitool-tinyipa/run.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
1- hosts: all
2 name: Autoconverted job legacy-tempest-dsvm-ironic-ipa-resourceclasses-partition-pxe_ipmitool-tinyipa
3 from old job gate-tempest-dsvm-ironic-ipa-resourceclasses-partition-pxe_ipmitool-tinyipa-ubuntu-xenial-nv
4 tasks:
5
6 - name: Ensure legacy workspace directory
7 file:
8 path: '{{ ansible_user_dir }}/workspace'
9 state: directory
10
11 - shell:
12 cmd: |
13 set -e
14 set -x
15 cat > clonemap.yaml << EOF
16 clonemap:
17 - name: openstack-infra/devstack-gate
18 dest: devstack-gate
19 EOF
20 /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
21 git://git.openstack.org \
22 openstack-infra/devstack-gate
23 executable: /bin/bash
24 chdir: '{{ ansible_user_dir }}/workspace'
25 environment: '{{ zuul | zuul_legacy_vars }}'
26
27 - shell:
28 cmd: |
29 cat << 'EOF' >> ironic-extra-vars
30 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_USE_RESOURCE_CLASSES=True"
31
32 EOF
33 chdir: '{{ ansible_user_dir }}/workspace'
34 environment: '{{ zuul | zuul_legacy_vars }}'
35
36 - shell:
37 cmd: |
38 cat << 'EOF' >> ironic-extra-vars
39 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER_ISCSI_WITH_IPA=True"
40 # Standardize VM size for each supported ramdisk
41 case "tinyipa" in
42 'tinyipa')
43 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384"
44 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
45 ;;
46 'tinyipa256')
47 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=256"
48 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
49 ;;
50 'coreos')
51 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=1280"
52 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=coreos"
53 ;;
54 # if using a ramdisk without a known good value, use the devstack
55 # default by not exporting any value for IRONIC_VM_SPECS_RAM
56 esac
57
58 EOF
59 chdir: '{{ ansible_user_dir }}/workspace'
60 environment: '{{ zuul | zuul_legacy_vars }}'
61
62 - shell:
63 cmd: |
64 cat << 'EOF' >> ironic-extra-vars
65 export DEVSTACK_GATE_TEMPEST_REGEX="ironic"
66
67 EOF
68 chdir: '{{ ansible_user_dir }}/workspace'
69 environment: '{{ zuul | zuul_legacy_vars }}'
70
71 - shell:
72 cmd: |
73 cat << 'EOF' >> ironic-vars-early
74 # use tempest plugin
75 if [[ "$ZUUL_BRANCH" != "master" ]] ; then
76 # NOTE(jroll) if this is not a patch against master, then
77 # fetch master to install the plugin
78 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'"
79 else
80 # on master, use the local change, so we can pick up any changes to the plugin
81 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic'"
82 fi
83 export TEMPEST_CONCURRENCY=1
84
85 EOF
86 chdir: '{{ ansible_user_dir }}/workspace'
87 environment: '{{ zuul | zuul_legacy_vars }}'
88
89 - shell:
90 cmd: |
91 set -e
92 set -x
93 export PROJECTS="openstack/ironic $PROJECTS"
94 export PROJECTS="openstack/ironic-lib $PROJECTS"
95 export PROJECTS="openstack/ironic-python-agent $PROJECTS"
96 export PROJECTS="openstack/python-ironicclient $PROJECTS"
97 export PROJECTS="openstack/pyghmi $PROJECTS"
98 export PROJECTS="openstack/virtualbmc $PROJECTS"
99 export PYTHONUNBUFFERED=true
100 export DEVSTACK_GATE_TEMPEST=1
101 export DEVSTACK_GATE_IRONIC=1
102 export DEVSTACK_GATE_NEUTRON=1
103 export DEVSTACK_GATE_VIRT_DRIVER=ironic
104 export DEVSTACK_GATE_CONFIGDRIVE=1
105 export DEVSTACK_GATE_IRONIC_DRIVER=pxe_ipmitool
106 export BRANCH_OVERRIDE=default
107 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
108 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
109 fi
110
111 if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
112 export DEVSTACK_GATE_TLSPROXY=1
113 fi
114
115 if [ "pxe_ipmitool" == "pxe_snmp" ] ; then
116 # explicitly enable pxe_snmp driver
117 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_DRIVERS=fake,pxe_snmp"
118 fi
119
120 if [ "pxe_ipmitool" == "redfish" ] ; then
121 # When deploying with redfish we need to enable the "redfish"
122 # hardware type
123 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_HARDWARE_TYPES=redfish"
124 fi
125
126 if [ "partition" == "wholedisk" ] ; then
127 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=True"
128 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=0"
129 else
130 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=False"
131 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=1"
132 fi
133
134 if [ -n "" ] ; then
135 export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=1
136 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=True"
137 export DEVSTACK_LOCAL_CONFIG+=$'\n'"USE_SUBNETPOOL=False"
138 else
139 export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=0
140 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=False"
141 fi
142
143 if [ "bios" == "uefi" ] ; then
144 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BOOT_MODE=uefi"
145 fi
146
147 export DEVSTACK_PROJECT_FROM_GIT=""
148 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=2"
149
150 # Ensure the ironic-vars-EARLY file exists
151 touch ironic-vars-early
152 # Pull in the EARLY variables injected by the optional builders
153 source ironic-vars-early
154
155 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic"
156
157 # Ensure the ironic-EXTRA-vars file exists
158 touch ironic-extra-vars
159 # Pull in the EXTRA variables injected by the optional builders
160 source ironic-extra-vars
161
162 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
163 ./safe-devstack-vm-gate-wrap.sh
164 executable: /bin/bash
165 chdir: '{{ ansible_user_dir }}/workspace'
166 environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/post.yaml b/playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/post.yaml
deleted file mode 100644
index e07f551..0000000
--- a/playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
1- hosts: primary
2 tasks:
3
4 - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
5 synchronize:
6 src: '{{ ansible_user_dir }}/workspace/'
7 dest: '{{ zuul.executor.log_root }}'
8 mode: pull
9 copy_links: true
10 verify_host: true
11 rsync_opts:
12 - --include=/logs/**
13 - --include=*/
14 - --exclude=*
15 - --prune-empty-dirs
diff --git a/playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/run.yaml
deleted file mode 100644
index ba8a9fa..0000000
--- a/playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/run.yaml
+++ /dev/null
@@ -1,156 +0,0 @@
1- hosts: all
2 name: Autoconverted job legacy-tempest-dsvm-ironic-pxe_ipa-full from old job gate-tempest-dsvm-ironic-pxe_ipa-full-ubuntu-xenial-nv
3 tasks:
4
5 - name: Ensure legacy workspace directory
6 file:
7 path: '{{ ansible_user_dir }}/workspace'
8 state: directory
9
10 - shell:
11 cmd: |
12 set -e
13 set -x
14 cat > clonemap.yaml << EOF
15 clonemap:
16 - name: openstack-infra/devstack-gate
17 dest: devstack-gate
18 EOF
19 /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
20 git://git.openstack.org \
21 openstack-infra/devstack-gate
22 executable: /bin/bash
23 chdir: '{{ ansible_user_dir }}/workspace'
24 environment: '{{ zuul | zuul_legacy_vars }}'
25
26 - shell:
27 cmd: |
28 cat << 'EOF' >> ironic-extra-vars
29 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER_ISCSI_WITH_IPA=True"
30 # Standardize VM size for each supported ramdisk
31 case "tinyipa" in
32 'tinyipa')
33 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384"
34 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
35 ;;
36 'tinyipa256')
37 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=256"
38 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
39 ;;
40 'coreos')
41 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=1280"
42 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=coreos"
43 ;;
44 # if using a ramdisk without a known good value, use the devstack
45 # default by not exporting any value for IRONIC_VM_SPECS_RAM
46 esac
47
48 EOF
49 chdir: '{{ ansible_user_dir }}/workspace'
50 environment: '{{ zuul | zuul_legacy_vars }}'
51
52 - shell:
53 cmd: |
54 cat << 'EOF' >> ironic-extra-vars
55 export DEVSTACK_GATE_TEMPEST_FULL=1
56
57 EOF
58 chdir: '{{ ansible_user_dir }}/workspace'
59 environment: '{{ zuul | zuul_legacy_vars }}'
60
61 - shell:
62 cmd: |
63 cat << 'EOF' >> ironic-vars-early
64 # use tempest plugin
65 if [[ "$ZUUL_BRANCH" != "master" ]] ; then
66 # NOTE(jroll) if this is not a patch against master, then
67 # fetch master to install the plugin
68 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'"
69 else
70 # on master, use the local change, so we can pick up any changes to the plugin
71 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic'"
72 fi
73 export TEMPEST_CONCURRENCY=1
74
75 EOF
76 chdir: '{{ ansible_user_dir }}/workspace'
77 environment: '{{ zuul | zuul_legacy_vars }}'
78
79 - shell:
80 cmd: |
81 set -e
82 set -x
83 export PROJECTS="openstack/ironic $PROJECTS"
84 export PROJECTS="openstack/ironic-lib $PROJECTS"
85 export PROJECTS="openstack/ironic-python-agent $PROJECTS"
86 export PROJECTS="openstack/python-ironicclient $PROJECTS"
87 export PROJECTS="openstack/pyghmi $PROJECTS"
88 export PROJECTS="openstack/virtualbmc $PROJECTS"
89 export PYTHONUNBUFFERED=true
90 export DEVSTACK_GATE_TEMPEST=1
91 export DEVSTACK_GATE_IRONIC=1
92 export DEVSTACK_GATE_NEUTRON=1
93 export DEVSTACK_GATE_VIRT_DRIVER=ironic
94 export DEVSTACK_GATE_CONFIGDRIVE=1
95 export DEVSTACK_GATE_IRONIC_DRIVER=pxe_ipmitool
96 export BRANCH_OVERRIDE=default
97 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
98 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
99 fi
100
101 if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
102 export DEVSTACK_GATE_TLSPROXY=1
103 fi
104
105 if [ "pxe_ipmitool" == "pxe_snmp" ] ; then
106 # explicitly enable pxe_snmp driver
107 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_DRIVERS=fake,pxe_snmp"
108 fi
109
110 if [ "pxe_ipmitool" == "redfish" ] ; then
111 # When deploying with redfish we need to enable the "redfish"
112 # hardware type
113 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_HARDWARE_TYPES=redfish"
114 fi
115
116 if [ "partition" == "wholedisk" ] ; then
117 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=True"
118 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=0"
119 else
120 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=False"
121 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=1"
122 fi
123
124 if [ -n "" ] ; then
125 export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=1
126 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=True"
127 export DEVSTACK_LOCAL_CONFIG+=$'\n'"USE_SUBNETPOOL=False"
128 else
129 export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=0
130 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=False"
131 fi
132
133 if [ "bios" == "uefi" ] ; then
134 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BOOT_MODE=uefi"
135 fi
136
137 export DEVSTACK_PROJECT_FROM_GIT=""
138 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=7"
139
140 # Ensure the ironic-vars-EARLY file exists
141 touch ironic-vars-early
142 # Pull in the EARLY variables injected by the optional builders
143 source ironic-vars-early
144
145 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic"
146
147 # Ensure the ironic-EXTRA-vars file exists
148 touch ironic-extra-vars
149 # Pull in the EXTRA variables injected by the optional builders
150 source ironic-extra-vars
151
152 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
153 ./safe-devstack-vm-gate-wrap.sh
154 executable: /bin/bash
155 chdir: '{{ ansible_user_dir }}/workspace'
156 environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml
index eb12bc6..ce2de34 100644
--- a/zuul.d/legacy-ironic-jobs.yaml
+++ b/zuul.d/legacy-ironic-jobs.yaml
@@ -78,13 +78,6 @@
78 timeout: 5400 78 timeout: 5400
79 79
80- job: 80- job:
81 name: ironic-tempest-dsvm-ipa-partition-pxe_ipmitool-tinyipa-python3
82 parent: legacy-ironic-dsvm-base
83 run: playbooks/legacy/tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-python3/run.yaml
84 post-run: playbooks/legacy/tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-python3/post.yaml
85 timeout: 5400
86
87- job:
88 name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode 81 name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode
89 parent: legacy-ironic-dsvm-base-multinode 82 parent: legacy-ironic-dsvm-base-multinode
90 run: playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml 83 run: playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml
@@ -170,28 +163,3 @@
170 - openstack/python-ironicclient 163 - openstack/python-ironicclient
171 - openstack/virtualbmc 164 - openstack/virtualbmc
172 nodeset: legacy-ubuntu-xenial-2-node 165 nodeset: legacy-ubuntu-xenial-2-node
173
174- job:
175 name: ironic-dsvm-functional
176 parent: legacy-ironic-dsvm-base
177 run: playbooks/legacy/ironic-dsvm-functional/run.yaml
178 post-run: playbooks/legacy/ironic-dsvm-functional/post.yaml
179 timeout: 4800
180 required-projects:
181 - openstack-infra/devstack-gate
182 - openstack/ironic
183 - openstack/ironic-python-agent
184
185- job:
186 name: ironic-tempest-dsvm-pxe_ipa-full
187 parent: legacy-ironic-dsvm-base
188 run: playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/run.yaml
189 post-run: playbooks/legacy/tempest-dsvm-ironic-pxe_ipa-full/post.yaml
190 timeout: 9600
191
192- job:
193 name: ironic-tempest-dsvm-ipa-resourceclasses-partition-pxe_ipmitool-tinyipa
194 parent: legacy-ironic-dsvm-base
195 run: playbooks/legacy/tempest-dsvm-ironic-ipa-resourceclasses-partition-pxe_ipmitool-tinyipa/run.yaml
196 post-run: playbooks/legacy/tempest-dsvm-ironic-ipa-resourceclasses-partition-pxe_ipmitool-tinyipa/post.yaml
197 timeout: 5400
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index f893716..e058d09 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -2,37 +2,29 @@
2 name: openstack/ironic 2 name: openstack/ironic
3 check: 3 check:
4 jobs: 4 jobs:
5 - ironic-tempest-dsvm-pxe_ipmitool-postgres: 5 - ironic-dsvm-standalone
6 voting: false 6 - ironic-grenade-dsvm
7 - ironic-grenade-dsvm-multinode-multitenant
8 - ironic-tempest-dsvm-bfv
9 - ironic-tempest-dsvm-ipa-partition-redfish-tinyipa
10 - ironic-tempest-dsvm-ipa-partition-uefi-pxe_ipmitool-tinyipa
11 - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode
12 - ironic-tempest-dsvm-ipa-wholedisk-bios-agent_ipmitool-tinyipa
13 # Non-voting jobs
7 - ironic-tempest-dsvm-ipa-wholedisk-bios-pxe_snmp-tinyipa: 14 - ironic-tempest-dsvm-ipa-wholedisk-bios-pxe_snmp-tinyipa:
8 voting: false 15 voting: false
9 - ironic-tempest-dsvm-ipa-partition-pxe_ipmitool-tinyipa-python3:
10 voting: false
11 - ironic-tempest-dsvm-ironic-inspector: 16 - ironic-tempest-dsvm-ironic-inspector:
12 voting: false 17 voting: false
13 - ironic-tempest-dsvm-ipa-wholedisk-bios-agent_ipmitool-tinyipa 18 - ironic-tempest-dsvm-pxe_ipmitool-postgres:
14 - ironic-tempest-dsvm-ipa-partition-uefi-pxe_ipmitool-tinyipa 19 voting: false
15 - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode
16 - ironic-tempest-dsvm-ipa-partition-redfish-tinyipa
17 - ironic-tempest-dsvm-bfv
18 - ironic-dsvm-standalone
19 - ironic-grenade-dsvm
20 - ironic-grenade-dsvm-multinode-multitenant
21 gate: 20 gate:
22 queue: ironic 21 queue: ironic
23 jobs: 22 jobs:
24 - ironic-tempest-dsvm-ipa-wholedisk-bios-agent_ipmitool-tinyipa
25 - ironic-tempest-dsvm-ipa-partition-uefi-pxe_ipmitool-tinyipa
26 - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode
27 - ironic-tempest-dsvm-ipa-partition-redfish-tinyipa
28 - ironic-tempest-dsvm-bfv
29 - ironic-dsvm-standalone 23 - ironic-dsvm-standalone
30 - ironic-grenade-dsvm 24 - ironic-grenade-dsvm
31 - ironic-grenade-dsvm-multinode-multitenant 25 - ironic-grenade-dsvm-multinode-multitenant
32 experimental: 26 - ironic-tempest-dsvm-bfv
33 jobs: 27 - ironic-tempest-dsvm-ipa-partition-redfish-tinyipa
34 - ironic-dsvm-functional 28 - ironic-tempest-dsvm-ipa-partition-uefi-pxe_ipmitool-tinyipa
35 - ironic-tempest-dsvm-pxe_ipa-full: 29 - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode
36 voting: false 30 - ironic-tempest-dsvm-ipa-wholedisk-bios-agent_ipmitool-tinyipa
37 - ironic-tempest-dsvm-ipa-resourceclasses-partition-pxe_ipmitool-tinyipa:
38 voting: false