Merge "Add auto-discovery test job to ironic-inspector"

jenkins/jobs/ironic.yaml

@@ -145,6 +145,57 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-ironic-inspector-dsvm-discovery{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 80
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_IRONIC=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_VIRT_DRIVER=ironic
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          export PROJECTS="openstack/ironic openstack/ironic-inspector $PROJECTS"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin ironic git://git.openstack.org/openstack/ironic"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector https://git.openstack.org/openstack/ironic-inspector"
+
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER_ISCSI_WITH_IPA=True"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_RAMDISK_ELEMENT=ironic-agent"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BUILD_DEPLOY_RAMDISK=False"
+          # IPA requires at least 1 GiB of RAM
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=1024"$'\n'"IRONIC_VM_COUNT=1"
+          # enable enroll hook
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK=enroll"
+
+          function post_test_hook {{
+                source $BASE/new/devstack/openrc admin admin
+                cd /opt/stack/new/ironic-inspector
+                sudo -E -u stack ./devstack/discovery_exercise.sh
+          }}
+          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
+
+    publishers:
+      - devstack-logs
+      - console-log
+
 - job-template:
     name: '{pipeline}-python-ironic-inspector-client-dsvm{job-suffix}'
     node: '{node}'

jenkins/jobs/projects.yaml

@@ -2602,6 +2602,11 @@
           job-suffix: ''
           branch-override: default
           ramdisk: 'ipa'
+      - '{pipeline}-ironic-inspector-dsvm-discovery{job-suffix}':
+          pipeline: gate
+          node: devstack-trusty
+          job-suffix: '-nv'
+          branch-override: default
 
 - project:
     name: ironic-inspector-specs

zuul/layout.yaml

@@ -6245,6 +6245,7 @@ projects:
       - gate-ironic-inspector-tox-func
       - gate-ironic-inspector-dsvm-dib
       - gate-ironic-inspector-dsvm-ipa
+      - gate-ironic-inspector-dsvm-discovery-nv
     gate:
       - gate-ironic-inspector-tox-func
       - gate-ironic-inspector-dsvm-ipa