Merge "Enable Octavia gate with Centos amphora"

jenkins/jobs/octavia.yaml

@@ -263,6 +263,64 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-octavia-{octaviaversion}-dsvm-{octaviatest}-{hypervisor}-{amphora_os}.{amphora_os_version}-{node}{suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - local_conf:
+          conf: |
+            [[local|localrc]]
+            OCTAVIA_HYPERVISOR={hypervisor}
+            OCTAVIA_AMP_BASE_OS={amphora_os}
+            OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID={amphora_os_version}
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
+          export DEVSTACK_GATE_EXERCISES=0
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_INSTALL_TESTONLY=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          export PROJECTS="openstack/barbican $PROJECTS"
+          export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
+          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
+          export PROJECTS="openstack/diskimage-builder $PROJECTS"
+          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
+          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
+          export PROJECTS="openstack/octavia $PROJECTS"
+
+          function gate_hook {{
+              $BASE/new/octavia/octavia/tests/contrib/gate_hook.sh tempest {octaviaversion} {octaviatest}
+          }}
+          export -f gate_hook
+
+          function post_test_hook {{
+              $BASE/new/octavia/octavia/tests/contrib/post_test_hook.sh tempest {octaviaversion} {octaviatest}
+          }}
+          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: gate-octavia-dashboard-dsvm-integration-{node}{suffix}
     node: '{node}'

jenkins/jobs/projects.yaml

@@ -8576,6 +8576,16 @@
           branch-override: default
           octaviaversion: v1
           octaviatest: scenario
+      - '{pipeline}-octavia-{octaviaversion}-dsvm-{octaviatest}-{hypervisor}-{amphora_os}.{amphora_os_version}-{node}{suffix}':
+          pipeline: gate
+          node: ubuntu-xenial
+          suffix: '-nv'
+          branch-override: default
+          octaviaversion: v1
+          octaviatest: scenario
+          hypervisor: kvm
+          amphora_os: centos
+          amphora_os_version: 7
       - 'gate-{name}-tox-{envlist}-{node}':
           envlist:
             - functional

zuul/layout.yaml

@@ -13435,6 +13435,7 @@ projects:
       - gate-octavia-v1-dsvm-py3x-scenario-ubuntu-xenial-nv
       - gate-octavia-v1-dsvm-scenario-multinode-nv
       - gate-octavia-v1-dsvm-py3x-scenario-multinode-nv
+      - gate-octavia-v1-dsvm-scenario-kvm-centos.7-ubuntu-xenial-nv
       - gate-octavia-v1-dsvm-scenario-lxd-ubuntu-xenial-nv
     gate:
       # legacy trusty gates mitaka - remove after mitaka EOL