summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn L. Villalovos <john.l.villalovos@intel.com>2017-12-13 08:13:22 -0800
committerJulia Kreger <juliaashleykreger@gmail.com>2017-12-15 14:21:55 +0000
commit7eaa7e5e1133290b8fdbde51fbdacd8383f92141 (patch)
tree139d8b409d8c3aa842922263839dfeb79c2a790d
parent713845d64ab63592f455cb2657225e27a662d4a0 (diff)
Use the tempest plugin from openstack/ironic-tempest-pluginstable/ocata
Follow-on patch will delete the openstack/ironic/ironic_tempest_plugin/ directory. But this will need to be done after this patch has been backported to the stable branches, otherwise the stable branches will break. Conflicts: playbooks/legacy/grenade-dsvm-ironic/run.yaml playbooks/legacy/ironic-dsvm-standalone/run.yaml playbooks/legacy/tempest-dsvm-ironic-bfv/run.yaml playbooks/legacy/tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-python3/run.yaml playbooks/legacy/tempest-dsvm-ironic-multitenant-network/run.yaml zuul.d/legacy-ironic-jobs.yaml Depends-On: I94b74aa83e6898a11f6b81862325cee395a0fd3e Change-Id: I31bb088679ea122efaa91d362e613edb74c14254 (cherry picked from commit cf8b62e86b00bd4a5fe3bea4beaabbcc0cabd2d0)
Notes
Notes (review): Code-Review+2: Julia Kreger <juliaashleykreger@gmail.com> Code-Review+1: John L. Villalovos <openstack.org@sodarock.com> Workflow+1: Julia Kreger <juliaashleykreger@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 15 Dec 2017 19:56:05 +0000 Reviewed-on: https://review.openstack.org/528251 Project: openstack/ironic Branch: refs/heads/stable/ocata
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml21
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-agent_ipmitool-tinyipa/run.yaml13
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-pxe_ipmitool-tinyipa/run.yaml13
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-ipa-partition-uefi-pxe_ipmitool-tinyipa/run.yaml13
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml13
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-agent_ipmitool-tinyipa/run.yaml13
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_ipmitool-tinyipa/run.yaml13
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_snmp-tinyipa/run.yaml13
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-multitenant-network/run.yaml13
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml13
-rw-r--r--zuul.d/legacy-ironic-jobs.yaml6
11 files changed, 37 insertions, 107 deletions
diff --git a/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml
index ad31ebe..6e50beb 100644
--- a/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml
+++ b/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml
@@ -68,14 +68,7 @@
68 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector" 68 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector"
69 69
70 # use tempest plugin 70 # use tempest plugin
71 if [[ "$ZUUL_BRANCH" != "master" ]] ; then 71 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
72 # NOTE(jroll) if this is not a patch against master, then
73 # fetch master to install the plugin
74 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic-inspector'"
75 else
76 # on master, use the local change, so we can pick up any changes to the plugin
77 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-inspector'"
78 fi
79 72
80 export IRONIC_INSPECTOR_AUTO_DISCOVERY=0 73 export IRONIC_INSPECTOR_AUTO_DISCOVERY=0
81 if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then 74 if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then
@@ -101,15 +94,8 @@
101 cmd: | 94 cmd: |
102 cat << 'EOF' >> ironic-vars-early 95 cat << 'EOF' >> ironic-vars-early
103 # use tempest plugin 96 # use tempest plugin
104 if [[ "$ZUUL_BRANCH" != "master" ]] ; then 97 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
105 # NOTE(jroll) if this is not a patch against master, then 98 export TEMPEST_CONCURRENCY=1
106 # fetch master to install the plugin
107 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'"
108 else
109 # on master, use the local change, so we can pick up any changes to the plugin
110 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic'"
111 fi
112 export TEMPEST_CONCURRENCY=1
113 99
114 EOF 100 EOF
115 chdir: '{{ ansible_user_dir }}/workspace' 101 chdir: '{{ ansible_user_dir }}/workspace'
@@ -122,6 +108,7 @@
122 export PROJECTS="openstack/ironic $PROJECTS" 108 export PROJECTS="openstack/ironic $PROJECTS"
123 export PROJECTS="openstack/ironic-lib $PROJECTS" 109 export PROJECTS="openstack/ironic-lib $PROJECTS"
124 export PROJECTS="openstack/ironic-python-agent $PROJECTS" 110 export PROJECTS="openstack/ironic-python-agent $PROJECTS"
111 export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
125 export PROJECTS="openstack/python-ironicclient $PROJECTS" 112 export PROJECTS="openstack/python-ironicclient $PROJECTS"
126 export PROJECTS="openstack/pyghmi $PROJECTS" 113 export PROJECTS="openstack/pyghmi $PROJECTS"
127 export PROJECTS="openstack/virtualbmc $PROJECTS" 114 export PROJECTS="openstack/virtualbmc $PROJECTS"
diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-agent_ipmitool-tinyipa/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-agent_ipmitool-tinyipa/run.yaml
index de348ae..e2de387 100644
--- a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-agent_ipmitool-tinyipa/run.yaml
+++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-agent_ipmitool-tinyipa/run.yaml
@@ -63,16 +63,8 @@
63 cmd: | 63 cmd: |
64 cat << 'EOF' >> ironic-vars-early 64 cat << 'EOF' >> ironic-vars-early
65 # use tempest plugin 65 # use tempest plugin
66 if [[ "$ZUUL_BRANCH" != "master" ]] ; then 66 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
67 # NOTE(jroll) if this is not a patch against master, then 67 export TEMPEST_CONCURRENCY=1
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 68 EOF
77 chdir: '{{ ansible_user_dir }}/workspace' 69 chdir: '{{ ansible_user_dir }}/workspace'
78 environment: '{{ zuul | zuul_legacy_vars }}' 70 environment: '{{ zuul | zuul_legacy_vars }}'
@@ -84,6 +76,7 @@
84 export PROJECTS="openstack/ironic $PROJECTS" 76 export PROJECTS="openstack/ironic $PROJECTS"
85 export PROJECTS="openstack/ironic-lib $PROJECTS" 77 export PROJECTS="openstack/ironic-lib $PROJECTS"
86 export PROJECTS="openstack/ironic-python-agent $PROJECTS" 78 export PROJECTS="openstack/ironic-python-agent $PROJECTS"
79 export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
87 export PROJECTS="openstack/python-ironicclient $PROJECTS" 80 export PROJECTS="openstack/python-ironicclient $PROJECTS"
88 export PROJECTS="openstack/pyghmi $PROJECTS" 81 export PROJECTS="openstack/pyghmi $PROJECTS"
89 export PROJECTS="openstack/virtualbmc $PROJECTS" 82 export PROJECTS="openstack/virtualbmc $PROJECTS"
diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-pxe_ipmitool-tinyipa/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-pxe_ipmitool-tinyipa/run.yaml
index b7b1141..d6f5757 100644
--- a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-pxe_ipmitool-tinyipa/run.yaml
+++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-pxe_ipmitool-tinyipa/run.yaml
@@ -63,16 +63,8 @@
63 cmd: | 63 cmd: |
64 cat << 'EOF' >> ironic-vars-early 64 cat << 'EOF' >> ironic-vars-early
65 # use tempest plugin 65 # use tempest plugin
66 if [[ "$ZUUL_BRANCH" != "master" ]] ; then 66 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
67 # NOTE(jroll) if this is not a patch against master, then 67 export TEMPEST_CONCURRENCY=1
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 68 EOF
77 chdir: '{{ ansible_user_dir }}/workspace' 69 chdir: '{{ ansible_user_dir }}/workspace'
78 environment: '{{ zuul | zuul_legacy_vars }}' 70 environment: '{{ zuul | zuul_legacy_vars }}'
@@ -84,6 +76,7 @@
84 export PROJECTS="openstack/ironic $PROJECTS" 76 export PROJECTS="openstack/ironic $PROJECTS"
85 export PROJECTS="openstack/ironic-lib $PROJECTS" 77 export PROJECTS="openstack/ironic-lib $PROJECTS"
86 export PROJECTS="openstack/ironic-python-agent $PROJECTS" 78 export PROJECTS="openstack/ironic-python-agent $PROJECTS"
79 export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
87 export PROJECTS="openstack/python-ironicclient $PROJECTS" 80 export PROJECTS="openstack/python-ironicclient $PROJECTS"
88 export PROJECTS="openstack/pyghmi $PROJECTS" 81 export PROJECTS="openstack/pyghmi $PROJECTS"
89 export PROJECTS="openstack/virtualbmc $PROJECTS" 82 export PROJECTS="openstack/virtualbmc $PROJECTS"
diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-uefi-pxe_ipmitool-tinyipa/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-uefi-pxe_ipmitool-tinyipa/run.yaml
index 60c1582..cdae7da 100644
--- a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-uefi-pxe_ipmitool-tinyipa/run.yaml
+++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-uefi-pxe_ipmitool-tinyipa/run.yaml
@@ -63,16 +63,8 @@
63 cmd: | 63 cmd: |
64 cat << 'EOF' >> ironic-vars-early 64 cat << 'EOF' >> ironic-vars-early
65 # use tempest plugin 65 # use tempest plugin
66 if [[ "$ZUUL_BRANCH" != "master" ]] ; then 66 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
67 # NOTE(jroll) if this is not a patch against master, then 67 export TEMPEST_CONCURRENCY=1
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 68 EOF
77 chdir: '{{ ansible_user_dir }}/workspace' 69 chdir: '{{ ansible_user_dir }}/workspace'
78 environment: '{{ zuul | zuul_legacy_vars }}' 70 environment: '{{ zuul | zuul_legacy_vars }}'
@@ -84,6 +76,7 @@
84 export PROJECTS="openstack/ironic $PROJECTS" 76 export PROJECTS="openstack/ironic $PROJECTS"
85 export PROJECTS="openstack/ironic-lib $PROJECTS" 77 export PROJECTS="openstack/ironic-lib $PROJECTS"
86 export PROJECTS="openstack/ironic-python-agent $PROJECTS" 78 export PROJECTS="openstack/ironic-python-agent $PROJECTS"
79 export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
87 export PROJECTS="openstack/python-ironicclient $PROJECTS" 80 export PROJECTS="openstack/python-ironicclient $PROJECTS"
88 export PROJECTS="openstack/pyghmi $PROJECTS" 81 export PROJECTS="openstack/pyghmi $PROJECTS"
89 export PROJECTS="openstack/virtualbmc $PROJECTS" 82 export PROJECTS="openstack/virtualbmc $PROJECTS"
diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml
index 4def3ef..2aaaf30 100644
--- a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml
+++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml
@@ -89,16 +89,8 @@
89 cmd: | 89 cmd: |
90 cat << 'EOF' >> ironic-vars-early 90 cat << 'EOF' >> ironic-vars-early
91 # use tempest plugin 91 # use tempest plugin
92 if [[ "$ZUUL_BRANCH" != "master" ]] ; then 92 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
93 # NOTE(jroll) if this is not a patch against master, then 93 export TEMPEST_CONCURRENCY=4
94 # fetch master to install the plugin
95 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'"
96 else
97 # on master, use the local change, so we can pick up any changes to the plugin
98 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic'"
99 fi
100 export TEMPEST_CONCURRENCY=4
101
102 EOF 94 EOF
103 chdir: '{{ ansible_user_dir }}/workspace' 95 chdir: '{{ ansible_user_dir }}/workspace'
104 environment: '{{ zuul | zuul_legacy_vars }}' 96 environment: '{{ zuul | zuul_legacy_vars }}'
@@ -110,6 +102,7 @@
110 export PROJECTS="openstack/ironic $PROJECTS" 102 export PROJECTS="openstack/ironic $PROJECTS"
111 export PROJECTS="openstack/ironic-lib $PROJECTS" 103 export PROJECTS="openstack/ironic-lib $PROJECTS"
112 export PROJECTS="openstack/ironic-python-agent $PROJECTS" 104 export PROJECTS="openstack/ironic-python-agent $PROJECTS"
105 export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
113 export PROJECTS="openstack/python-ironicclient $PROJECTS" 106 export PROJECTS="openstack/python-ironicclient $PROJECTS"
114 export PROJECTS="openstack/pyghmi $PROJECTS" 107 export PROJECTS="openstack/pyghmi $PROJECTS"
115 export PROJECTS="openstack/virtualbmc $PROJECTS" 108 export PROJECTS="openstack/virtualbmc $PROJECTS"
diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-agent_ipmitool-tinyipa/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-agent_ipmitool-tinyipa/run.yaml
index 242459b..b12bc9b 100644
--- a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-agent_ipmitool-tinyipa/run.yaml
+++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-agent_ipmitool-tinyipa/run.yaml
@@ -63,16 +63,8 @@
63 cmd: | 63 cmd: |
64 cat << 'EOF' >> ironic-vars-early 64 cat << 'EOF' >> ironic-vars-early
65 # use tempest plugin 65 # use tempest plugin
66 if [[ "$ZUUL_BRANCH" != "master" ]] ; then 66 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
67 # NOTE(jroll) if this is not a patch against master, then 67 export TEMPEST_CONCURRENCY=1
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 68 EOF
77 chdir: '{{ ansible_user_dir }}/workspace' 69 chdir: '{{ ansible_user_dir }}/workspace'
78 environment: '{{ zuul | zuul_legacy_vars }}' 70 environment: '{{ zuul | zuul_legacy_vars }}'
@@ -84,6 +76,7 @@
84 export PROJECTS="openstack/ironic $PROJECTS" 76 export PROJECTS="openstack/ironic $PROJECTS"
85 export PROJECTS="openstack/ironic-lib $PROJECTS" 77 export PROJECTS="openstack/ironic-lib $PROJECTS"
86 export PROJECTS="openstack/ironic-python-agent $PROJECTS" 78 export PROJECTS="openstack/ironic-python-agent $PROJECTS"
79 export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
87 export PROJECTS="openstack/python-ironicclient $PROJECTS" 80 export PROJECTS="openstack/python-ironicclient $PROJECTS"
88 export PROJECTS="openstack/pyghmi $PROJECTS" 81 export PROJECTS="openstack/pyghmi $PROJECTS"
89 export PROJECTS="openstack/virtualbmc $PROJECTS" 82 export PROJECTS="openstack/virtualbmc $PROJECTS"
diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_ipmitool-tinyipa/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_ipmitool-tinyipa/run.yaml
index 6784b7f..19327b2 100644
--- a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_ipmitool-tinyipa/run.yaml
+++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_ipmitool-tinyipa/run.yaml
@@ -63,16 +63,8 @@
63 cmd: | 63 cmd: |
64 cat << 'EOF' >> ironic-vars-early 64 cat << 'EOF' >> ironic-vars-early
65 # use tempest plugin 65 # use tempest plugin
66 if [[ "$ZUUL_BRANCH" != "master" ]] ; then 66 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
67 # NOTE(jroll) if this is not a patch against master, then 67 export TEMPEST_CONCURRENCY=1
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 68 EOF
77 chdir: '{{ ansible_user_dir }}/workspace' 69 chdir: '{{ ansible_user_dir }}/workspace'
78 environment: '{{ zuul | zuul_legacy_vars }}' 70 environment: '{{ zuul | zuul_legacy_vars }}'
@@ -84,6 +76,7 @@
84 export PROJECTS="openstack/ironic $PROJECTS" 76 export PROJECTS="openstack/ironic $PROJECTS"
85 export PROJECTS="openstack/ironic-lib $PROJECTS" 77 export PROJECTS="openstack/ironic-lib $PROJECTS"
86 export PROJECTS="openstack/ironic-python-agent $PROJECTS" 78 export PROJECTS="openstack/ironic-python-agent $PROJECTS"
79 export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
87 export PROJECTS="openstack/python-ironicclient $PROJECTS" 80 export PROJECTS="openstack/python-ironicclient $PROJECTS"
88 export PROJECTS="openstack/pyghmi $PROJECTS" 81 export PROJECTS="openstack/pyghmi $PROJECTS"
89 export PROJECTS="openstack/virtualbmc $PROJECTS" 82 export PROJECTS="openstack/virtualbmc $PROJECTS"
diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_snmp-tinyipa/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_snmp-tinyipa/run.yaml
index 5f6b04d..828b37c 100644
--- a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_snmp-tinyipa/run.yaml
+++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_snmp-tinyipa/run.yaml
@@ -63,16 +63,8 @@
63 cmd: | 63 cmd: |
64 cat << 'EOF' >> ironic-vars-early 64 cat << 'EOF' >> ironic-vars-early
65 # use tempest plugin 65 # use tempest plugin
66 if [[ "$ZUUL_BRANCH" != "master" ]] ; then 66 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
67 # NOTE(jroll) if this is not a patch against master, then 67 export TEMPEST_CONCURRENCY=1
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 68 EOF
77 chdir: '{{ ansible_user_dir }}/workspace' 69 chdir: '{{ ansible_user_dir }}/workspace'
78 environment: '{{ zuul | zuul_legacy_vars }}' 70 environment: '{{ zuul | zuul_legacy_vars }}'
@@ -84,6 +76,7 @@
84 export PROJECTS="openstack/ironic $PROJECTS" 76 export PROJECTS="openstack/ironic $PROJECTS"
85 export PROJECTS="openstack/ironic-lib $PROJECTS" 77 export PROJECTS="openstack/ironic-lib $PROJECTS"
86 export PROJECTS="openstack/ironic-python-agent $PROJECTS" 78 export PROJECTS="openstack/ironic-python-agent $PROJECTS"
79 export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
87 export PROJECTS="openstack/python-ironicclient $PROJECTS" 80 export PROJECTS="openstack/python-ironicclient $PROJECTS"
88 export PROJECTS="openstack/pyghmi $PROJECTS" 81 export PROJECTS="openstack/pyghmi $PROJECTS"
89 export PROJECTS="openstack/virtualbmc $PROJECTS" 82 export PROJECTS="openstack/virtualbmc $PROJECTS"
diff --git a/playbooks/legacy/tempest-dsvm-ironic-multitenant-network/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-multitenant-network/run.yaml
index 18581e2..9cd459b 100644
--- a/playbooks/legacy/tempest-dsvm-ironic-multitenant-network/run.yaml
+++ b/playbooks/legacy/tempest-dsvm-ironic-multitenant-network/run.yaml
@@ -89,16 +89,8 @@
89 cmd: | 89 cmd: |
90 cat << 'EOF' >> ironic-vars-early 90 cat << 'EOF' >> ironic-vars-early
91 # use tempest plugin 91 # use tempest plugin
92 if [[ "$ZUUL_BRANCH" != "master" ]] ; then 92 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
93 # NOTE(jroll) if this is not a patch against master, then 93 export TEMPEST_CONCURRENCY=1
94 # fetch master to install the plugin
95 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'"
96 else
97 # on master, use the local change, so we can pick up any changes to the plugin
98 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic'"
99 fi
100 export TEMPEST_CONCURRENCY=1
101
102 EOF 94 EOF
103 chdir: '{{ ansible_user_dir }}/workspace' 95 chdir: '{{ ansible_user_dir }}/workspace'
104 environment: '{{ zuul | zuul_legacy_vars }}' 96 environment: '{{ zuul | zuul_legacy_vars }}'
@@ -110,6 +102,7 @@
110 export PROJECTS="openstack/ironic $PROJECTS" 102 export PROJECTS="openstack/ironic $PROJECTS"
111 export PROJECTS="openstack/ironic-lib $PROJECTS" 103 export PROJECTS="openstack/ironic-lib $PROJECTS"
112 export PROJECTS="openstack/ironic-python-agent $PROJECTS" 104 export PROJECTS="openstack/ironic-python-agent $PROJECTS"
105 export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
113 export PROJECTS="openstack/python-ironicclient $PROJECTS" 106 export PROJECTS="openstack/python-ironicclient $PROJECTS"
114 export PROJECTS="openstack/pyghmi $PROJECTS" 107 export PROJECTS="openstack/pyghmi $PROJECTS"
115 export PROJECTS="openstack/virtualbmc $PROJECTS" 108 export PROJECTS="openstack/virtualbmc $PROJECTS"
diff --git a/playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml
index c590f39..4d67c8c 100644
--- a/playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml
+++ b/playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml
@@ -81,16 +81,8 @@
81 cmd: | 81 cmd: |
82 cat << 'EOF' >> ironic-vars-early 82 cat << 'EOF' >> ironic-vars-early
83 # use tempest plugin 83 # use tempest plugin
84 if [[ "$ZUUL_BRANCH" != "master" ]] ; then 84 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
85 # NOTE(jroll) if this is not a patch against master, then 85 export TEMPEST_CONCURRENCY=1
86 # fetch master to install the plugin
87 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'"
88 else
89 # on master, use the local change, so we can pick up any changes to the plugin
90 export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic'"
91 fi
92 export TEMPEST_CONCURRENCY=1
93
94 EOF 86 EOF
95 chdir: '{{ ansible_user_dir }}/workspace' 87 chdir: '{{ ansible_user_dir }}/workspace'
96 environment: '{{ zuul | zuul_legacy_vars }}' 88 environment: '{{ zuul | zuul_legacy_vars }}'
@@ -102,6 +94,7 @@
102 export PROJECTS="openstack/ironic $PROJECTS" 94 export PROJECTS="openstack/ironic $PROJECTS"
103 export PROJECTS="openstack/ironic-lib $PROJECTS" 95 export PROJECTS="openstack/ironic-lib $PROJECTS"
104 export PROJECTS="openstack/ironic-python-agent $PROJECTS" 96 export PROJECTS="openstack/ironic-python-agent $PROJECTS"
97 export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
105 export PROJECTS="openstack/python-ironicclient $PROJECTS" 98 export PROJECTS="openstack/python-ironicclient $PROJECTS"
106 export PROJECTS="openstack/pyghmi $PROJECTS" 99 export PROJECTS="openstack/pyghmi $PROJECTS"
107 export PROJECTS="openstack/virtualbmc $PROJECTS" 100 export PROJECTS="openstack/virtualbmc $PROJECTS"
diff --git a/zuul.d/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml
index 74f3467..497a3db 100644
--- a/zuul.d/legacy-ironic-jobs.yaml
+++ b/zuul.d/legacy-ironic-jobs.yaml
@@ -13,11 +13,14 @@
13 - ^setup.cfg$ 13 - ^setup.cfg$
14 - ^tools/.*$ 14 - ^tools/.*$
15 - ^tox.ini$ 15 - ^tox.ini$
16 # NOTE: When adding to 'required-projects' also need to add a corresponding
17 # "export PROJECTS=..." line in all the playbooks/legacy/*/run.yaml files
16 required-projects: 18 required-projects:
17 - openstack-infra/devstack-gate 19 - openstack-infra/devstack-gate
18 - openstack/ironic 20 - openstack/ironic
19 - openstack/ironic-lib 21 - openstack/ironic-lib
20 - openstack/ironic-python-agent 22 - openstack/ironic-python-agent
23 - openstack/ironic-tempest-plugin
21 - openstack/pyghmi 24 - openstack/pyghmi
22 - openstack/python-ironicclient 25 - openstack/python-ironicclient
23 - openstack/tempest 26 - openstack/tempest
@@ -38,11 +41,14 @@
38 - ^setup.cfg$ 41 - ^setup.cfg$
39 - ^tools/.*$ 42 - ^tools/.*$
40 - ^tox.ini$ 43 - ^tox.ini$
44 # NOTE: When adding to 'required-projects' also need to add a corresponding
45 # "export PROJECTS=..." line in all the playbooks/legacy/*/run.yaml files
41 required-projects: 46 required-projects:
42 - openstack-infra/devstack-gate 47 - openstack-infra/devstack-gate
43 - openstack/ironic 48 - openstack/ironic
44 - openstack/ironic-lib 49 - openstack/ironic-lib
45 - openstack/ironic-python-agent 50 - openstack/ironic-python-agent
51 - openstack/ironic-tempest-plugin
46 - openstack/pyghmi 52 - openstack/pyghmi
47 - openstack/python-ironicclient 53 - openstack/python-ironicclient
48 - openstack/tempest 54 - openstack/tempest