Merge "Use the tempest plugin from openstack/ironic-tempest-plugin"

playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src/run.yaml

@@ -63,16 +63,8 @@
         cmd: |
           cat << 'EOF' >> ironic-vars-early
             # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
-            # NOTE(jroll) if this is not a patch against master, then
+            export TEMPEST_CONCURRENCY=1
-            # 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 }}'
@@ -84,6 +76,7 @@
           export PROJECTS="openstack/ironic $PROJECTS"
           export PROJECTS="openstack/ironic-lib $PROJECTS"
           export PROJECTS="openstack/ironic-python-agent $PROJECTS"
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-ironicclient $PROJECTS"
           export PROJECTS="openstack/pyghmi $PROJECTS"
           export PROJECTS="openstack/virtualbmc $PROJECTS"

playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src/run.yaml

@@ -63,16 +63,8 @@
         cmd: |
           cat << 'EOF' >> ironic-vars-early
             # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
-            # NOTE(jroll) if this is not a patch against master, then
+            export TEMPEST_CONCURRENCY=1
-            # 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 }}'
@@ -84,6 +76,7 @@
           export PROJECTS="openstack/ironic $PROJECTS"
           export PROJECTS="openstack/ironic-lib $PROJECTS"
           export PROJECTS="openstack/ironic-python-agent $PROJECTS"
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-ironicclient $PROJECTS"
           export PROJECTS="openstack/pyghmi $PROJECTS"
           export PROJECTS="openstack/virtualbmc $PROJECTS"

playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src/run.yaml

@@ -63,16 +63,8 @@
         cmd: |
           cat << 'EOF' >> ironic-vars-early
             # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
-            # NOTE(jroll) if this is not a patch against master, then
+            export TEMPEST_CONCURRENCY=1
-            # 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 }}'
@@ -84,6 +76,7 @@
           export PROJECTS="openstack/ironic $PROJECTS"
           export PROJECTS="openstack/ironic-lib $PROJECTS"
           export PROJECTS="openstack/ironic-python-agent $PROJECTS"
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-ironicclient $PROJECTS"
           export PROJECTS="openstack/pyghmi $PROJECTS"
           export PROJECTS="openstack/virtualbmc $PROJECTS"

playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src/run.yaml

@@ -63,16 +63,8 @@
         cmd: |
           cat << 'EOF' >> ironic-vars-early
             # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
-            # NOTE(jroll) if this is not a patch against master, then
+            export TEMPEST_CONCURRENCY=1
-            # 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 }}'
@@ -84,6 +76,7 @@
           export PROJECTS="openstack/ironic $PROJECTS"
           export PROJECTS="openstack/ironic-lib $PROJECTS"
           export PROJECTS="openstack/ironic-python-agent $PROJECTS"
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-ironicclient $PROJECTS"
           export PROJECTS="openstack/pyghmi $PROJECTS"
           export PROJECTS="openstack/virtualbmc $PROJECTS"

playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src/run.yaml

@@ -63,16 +63,8 @@
         cmd: |
           cat << 'EOF' >> ironic-vars-early
             # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
-            # NOTE(jroll) if this is not a patch against master, then
+            export TEMPEST_CONCURRENCY=1
-            # 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 }}'
@@ -84,6 +76,7 @@
           export PROJECTS="openstack/ironic $PROJECTS"
           export PROJECTS="openstack/ironic-lib $PROJECTS"
           export PROJECTS="openstack/ironic-python-agent $PROJECTS"
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-ironicclient $PROJECTS"
           export PROJECTS="openstack/pyghmi $PROJECTS"
           export PROJECTS="openstack/virtualbmc $PROJECTS"

playbooks/legacy/ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3/run.yaml

@@ -63,16 +63,8 @@
         cmd: |
           cat << 'EOF' >> ironic-vars-early
             # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
-            # NOTE(jroll) if this is not a patch against master, then
+            export TEMPEST_CONCURRENCY=1
-            # 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 }}'
@@ -109,6 +101,7 @@
           export PROJECTS="openstack/ironic $PROJECTS"
           export PROJECTS="openstack/ironic-lib $PROJECTS"
           export PROJECTS="openstack/ironic-python-agent $PROJECTS"
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-ironicclient $PROJECTS"
           export PROJECTS="openstack/pyghmi $PROJECTS"
           export PROJECTS="openstack/virtualbmc $PROJECTS"

playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src/run.yaml

@@ -63,16 +63,8 @@
         cmd: |
           cat << 'EOF' >> ironic-vars-early
             # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
-            # NOTE(jroll) if this is not a patch against master, then
+            export TEMPEST_CONCURRENCY=1
-            # 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 }}'
@@ -84,6 +76,7 @@
           export PROJECTS="openstack/ironic $PROJECTS"
           export PROJECTS="openstack/ironic-lib $PROJECTS"
           export PROJECTS="openstack/ironic-python-agent $PROJECTS"
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-ironicclient $PROJECTS"
           export PROJECTS="openstack/pyghmi $PROJECTS"
           export PROJECTS="openstack/virtualbmc $PROJECTS"

playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src/run.yaml

@@ -63,16 +63,8 @@
         cmd: |
           cat << 'EOF' >> ironic-vars-early
             # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
-            # NOTE(jroll) if this is not a patch against master, then
+            export TEMPEST_CONCURRENCY=1
-            # 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 }}'
@@ -84,6 +76,7 @@
           export PROJECTS="openstack/ironic $PROJECTS"
           export PROJECTS="openstack/ironic-lib $PROJECTS"
           export PROJECTS="openstack/ironic-python-agent $PROJECTS"
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-ironicclient $PROJECTS"
           export PROJECTS="openstack/pyghmi $PROJECTS"
           export PROJECTS="openstack/virtualbmc $PROJECTS"

playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src/run.yaml

@@ -63,16 +63,8 @@
         cmd: |
           cat << 'EOF' >> ironic-vars-early
             # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
-            # NOTE(jroll) if this is not a patch against master, then
+            export TEMPEST_CONCURRENCY=1
-            # 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 }}'
@@ -84,6 +76,7 @@
           export PROJECTS="openstack/ironic $PROJECTS"
           export PROJECTS="openstack/ironic-lib $PROJECTS"
           export PROJECTS="openstack/ironic-python-agent $PROJECTS"
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-ironicclient $PROJECTS"
           export PROJECTS="openstack/pyghmi $PROJECTS"
           export PROJECTS="openstack/virtualbmc $PROJECTS"

playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src/run.yaml

@@ -63,16 +63,8 @@
         cmd: |
           cat << 'EOF' >> ironic-vars-early
             # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
-            # NOTE(jroll) if this is not a patch against master, then
+            export TEMPEST_CONCURRENCY=1
-            # 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 }}'
@@ -84,6 +76,7 @@
           export PROJECTS="openstack/ironic $PROJECTS"
           export PROJECTS="openstack/ironic-lib $PROJECTS"
           export PROJECTS="openstack/ironic-python-agent $PROJECTS"
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-ironicclient $PROJECTS"
           export PROJECTS="openstack/pyghmi $PROJECTS"
           export PROJECTS="openstack/virtualbmc $PROJECTS"

playbooks/legacy/tempest-dsvm-ironic-inspector-src/run.yaml

@@ -68,14 +68,7 @@
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector"
 
           # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
-            # 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
@@ -101,16 +94,8 @@
         cmd: |
           cat << 'EOF' >> ironic-vars-early
             # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
-            # NOTE(jroll) if this is not a patch against master, then
+            export TEMPEST_CONCURRENCY=1
-            # 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 }}'
@@ -122,6 +107,7 @@
           export PROJECTS="openstack/ironic $PROJECTS"
           export PROJECTS="openstack/ironic-lib $PROJECTS"
           export PROJECTS="openstack/ironic-python-agent $PROJECTS"
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-ironicclient $PROJECTS"
           export PROJECTS="openstack/pyghmi $PROJECTS"
           export PROJECTS="openstack/virtualbmc $PROJECTS"

zuul.d/legacy-ironic-jobs.yaml

@@ -17,6 +17,7 @@
       - openstack/ironic
       - openstack/ironic-lib
       - openstack/ironic-python-agent
+      - openstack/ironic-tempest-plugin
       - openstack/pyghmi
       - openstack/python-ironicclient
       - openstack/tempest