Enable Python3x DSVM in Octavia deliverables

Add in Octavia, Neutron LBaaS and Neutron LBaaS dashboard DSVM tests using Python 3.x version as NV tests. Depends-On: Ie42a2652da4dcf21103f85d60a4a041b0d436dbd Change-Id: I0a4e57b23d0905af767137f9e88c097981cbaadc
2017-01-05 11:42:20 -06:00 · 2017-01-05 11:42:20 -06:00 · 511199b5c2
commit 511199b5c2
parent 3a83266c08
4 changed files with 261 additions and 0 deletions
--- a/jenkins/jobs/neutron-lbaas.yaml
+++ b/jenkins/jobs/neutron-lbaas.yaml
@ -50,6 +50,59 @@
      - devstack-logs
      - console-log

+- job-template:
+    name: '{pipeline}-neutron-{lbaasversion}-dsvm-py3x-{lbaastest}-{node}{suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export DEVSTACK_GATE_USE_PYTHON3=True
+          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/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest {lbaasversion} {lbaastest}
+          }}
+          export -f gate_hook
+
+          function post_test_hook {{
+              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest {lbaasversion} {lbaastest}
+          }}
+          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}-neutron-lbaas-dsvm-functional-{node}{suffix}'
    node: '{node}'
@ -121,6 +174,51 @@
          export PROJECTS="openstack/neutron-lbaas-dashboard $PROJECTS"


+          function pre_test_hook {{
+              $BASE/new/neutron-lbaas-dashboard/tools/gate/integration/pre_test_hook.sh
+          }}
+          export -f pre_test_hook
+
+          function post_test_hook {{
+              $BASE/new/neutron-lbaas-dashboard/tools/gate/integration/post_test_hook.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:
+      - test-results
+      - devstack-logs
+      - publish-screenshots
+      - console-log
+
+- job-template:
+    name: gate-neutron-lbaas-dashboard-dsvm-py3x-integration-{node}{suffix}
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 60
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - firefox-install
+      - xvfb-install
+      - shell: |
+          #!/bin/bash -xe
+          export DEVSTACK_GATE_USE_PYTHON3=True
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_EXERCISES=0
+          export DEVSTACK_GATE_INSTALL_TESTONLY=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export PROJECTS="openstack/neutron-lbaas-dashboard $PROJECTS"
+
+
          function pre_test_hook {{
              $BASE/new/neutron-lbaas-dashboard/tools/gate/integration/pre_test_hook.sh
          }}
--- a/jenkins/jobs/octavia.yaml
+++ b/jenkins/jobs/octavia.yaml
@ -49,6 +49,60 @@
    publishers:
      - devstack-logs
      - console-log
+
+- job-template:
+    name: '{pipeline}-octavia-{octaviaversion}-dsvm-py3x-{octaviatest}-{node}{suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export DEVSTACK_GATE_USE_PYTHON3=True
+          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: '{pipeline}-octavia-{octaviaversion}-dsvm-{octaviatest}-multinode{suffix}'
    node: '{node}'
@ -101,3 +155,57 @@
    publishers:
      - devstack-logs
      - console-log
+
+- job-template:
+    name: '{pipeline}-octavia-{octaviaversion}-dsvm-py3x-{octaviatest}-multinode{suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export DEVSTACK_GATE_USE_PYTHON3=True
+          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 DEVSTACK_GATE_TOPOLOGY="multinode"
+          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
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@ -7666,6 +7666,13 @@
          branch-override: default
          lbaasversion: lbaasv2
          lbaastest: api
+      - '{pipeline}-neutron-{lbaasversion}-dsvm-py3x-{lbaastest}-{node}{suffix}':
+          pipeline: gate
+          node: ubuntu-xenial
+          suffix: '-nv'
+          branch-override: default
+          lbaasversion: lbaasv2
+          lbaastest: api
      - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}-{node}{suffix}':
          pipeline: gate
          node: ubuntu-xenial
@ -7676,6 +7683,16 @@
            - scenario
            - scenario-namespace
            - api-namespace
+      - '{pipeline}-neutron-{lbaasversion}-dsvm-py3x-{lbaastest}-{node}{suffix}':
+          pipeline: gate
+          node: ubuntu-xenial
+          suffix: '-nv'
+          branch-override: default
+          lbaasversion: lbaasv2
+          lbaastest:
+            - scenario
+            - scenario-namespace
+            - api-namespace
      - '{pipeline}-neutron-lbaas-dsvm-functional-{node}{suffix}':
          pipeline: gate
          node: ubuntu-xenial
@ -7696,6 +7713,9 @@
            - ubuntu-trusty
            - ubuntu-xenial
          suffix: '-nv'
+      - gate-neutron-lbaas-dashboard-dsvm-py3x-integration-{node}{suffix}:
+          node: ubuntu-xenial
+          suffix: '-nv'

 - project:
    name: neutron-lib
@ -7978,6 +7998,13 @@
          branch-override: default
          octaviaversion: v1
          octaviatest: scenario
+      - '{pipeline}-octavia-{octaviaversion}-dsvm-py3x-{octaviatest}-{node}{suffix}':
+          pipeline: gate
+          node: ubuntu-xenial
+          suffix: '-nv'
+          branch-override: default
+          octaviaversion: v1
+          octaviatest: scenario
      - '{pipeline}-octavia-{octaviaversion}-dsvm-{octaviatest}-multinode{suffix}':
          pipeline: gate
          node: ubuntu-xenial-2-node
@ -7985,6 +8012,13 @@
          branch-override: default
          octaviaversion: v1
          octaviatest: scenario
+      - '{pipeline}-octavia-{octaviaversion}-dsvm-py3x-{octaviatest}-multinode{suffix}':
+          pipeline: gate
+          node: ubuntu-xenial-2-node
+          suffix: '-nv'
+          branch-override: default
+          octaviaversion: v1
+          octaviatest: scenario
      - 'gate-{name}-tox-{envlist}-{node}':
          envlist: functional
          node: ubuntu-xenial
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@ -2014,6 +2014,18 @@ jobs:
  - name: ^gate-neutron-lbaasv2-dsvm-api-ubuntu-xenial
    branch: ^(?!stable/(mitaka|newton)).*$

+  # This job is just to check Python 3.X compliance in master for NLBaaSv2
+  - name: ^gate-neutron-lbaasv2-dsvm-py3x-.*$
+    branch: ^(?!stable)
+
+  # This job is just to check Python 3.X compliance in master for NLBaaSv2 dashboard
+  - name: ^gate-neutron-lbaas-dashboard-dsvm-py3x-.*$
+    branch: ^(?!stable)
+
+  # This job is just to check Python 3.X compliance in master for Octavia
+  - name: ^gate-octavia-v1-dsvm-py3x-.*$
+    branch: ^(?!stable)
+
  # Octavia functional tests
  - name: ^gate-octavia-tox-functional-ubuntu-xenial
    branch: ^(?!stable/(mitaka|newton)).*$
@ -12189,7 +12201,9 @@ projects:
      - gate-neutron-lbaasv2-dsvm-scenario-ubuntu-trusty-nv
      - gate-neutron-lbaasv2-dsvm-scenario-namespace-ubuntu-trusty-nv
      - gate-neutron-lbaasv2-dsvm-api-ubuntu-xenial
+      - gate-neutron-lbaasv2-dsvm-py3x-api-ubuntu-xenial-nv
      - gate-neutron-lbaasv2-dsvm-api-namespace-ubuntu-xenial-nv
+      - gate-neutron-lbaasv2-dsvm-py3x-api-namespace-ubuntu-xenial-nv
      - gate-neutron-lbaas-dsvm-functional-ubuntu-xenial-nv
      - gate-neutron-lbaasv2-dsvm-minimal-ubuntu-xenial
      - gate-neutron-lbaasv2-dsvm-loadbalancer-ubuntu-xenial
@ -12198,7 +12212,9 @@ projects:
      - gate-neutron-lbaasv2-dsvm-member-ubuntu-xenial
      - gate-neutron-lbaasv2-dsvm-healthmonitor-ubuntu-xenial
      - gate-neutron-lbaasv2-dsvm-scenario-ubuntu-xenial-nv
+      - gate-neutron-lbaasv2-dsvm-py3x-scenario-ubuntu-xenial-nv
      - gate-neutron-lbaasv2-dsvm-scenario-namespace-ubuntu-xenial-nv
+      - gate-neutron-lbaasv2-dsvm-py3x-scenario-namespace-ubuntu-xenial-nv
    gate:
      - gate-neutron-lbaasv1-dsvm-api-ubuntu-trusty
      - gate-neutron-lbaasv2-dsvm-minimal-ubuntu-trusty
@ -12228,6 +12244,7 @@ projects:
      - gate-neutron-lbaas-dashboard-nodejs4-npm-run-test
      - gate-neutron-lbaas-dashboard-dsvm-integration-ubuntu-trusty-nv
      - gate-neutron-lbaas-dashboard-dsvm-integration-ubuntu-xenial-nv
+      - gate-neutron-lbaas-dashboard-dsvm-py3x-integration-ubuntu-xenial-nv

  - name: openstack/neutron-lib
    template:
@ -12552,10 +12569,14 @@ projects:
      - gate-neutron-lbaasv2-dsvm-healthmonitor-ubuntu-xenial
      # current xenial jobs (newton|ocata|>)
      - gate-neutron-lbaasv2-dsvm-api-ubuntu-xenial
+      - gate-neutron-lbaasv2-dsvm-py3x-api-ubuntu-xenial-nv
      - gate-neutron-lbaasv2-dsvm-scenario-ubuntu-xenial-nv
+      - gate-neutron-lbaasv2-dsvm-py3x-scenario-ubuntu-xenial-nv
      - gate-octavia-tox-functional-ubuntu-xenial
      - gate-octavia-v1-dsvm-scenario-ubuntu-xenial-nv
+      - 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:
      # legacy trusty gates mitaka - remove after mitaka EOL
      - gate-neutron-lbaasv2-dsvm-loadbalancer-ubuntu-trusty