Merge "Congress - Add replicated PE job"

jenkins/jobs/congress.yaml

@@ -13,17 +13,7 @@
       - devstack-checkout
       - shell: |
           #!/bin/bash -xe
-          ENABLED_SERVICES=tempest,
-          ENABLED_SERVICES+=key,g-api,g-reg,
-          ENABLED_SERVICES+=n-api,n-crt,n-cpu,n-sch,n-cauth,
-          # n-obj has been removed from mitaka
-          if [[ "$ZUUL_BRANCH" == "stable/liberty" ]]; then
-              ENABLED_SERVICES+=n-obj,
-          fi
-          ENABLED_SERVICES+=horizon,mysql,rabbit,sysstat,
-          ENABLED_SERVICES+=cinder,c-api,c-vol,c-sch,n-cond,
-          ENABLED_SERVICES+=neutron,q-svc,q-agt,q-dhcp,q-l3,q-meta,
-          ENABLED_SERVICES+=s-proxy,s-object,s-container,s-account,
+          ENABLED_SERVICES=s-proxy,s-object,s-container,s-account,
           ENABLED_SERVICES+=h-eng,h-api,h-api-cfn,h-api-cw
 
           DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
@@ -75,3 +65,48 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-congress-pe-replicated{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 60
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          ENABLED_SERVICES=s-proxy,s-object,s-container,s-account,
+          ENABLED_SERVICES+=h-eng,h-api,h-api-cfn,h-api-cw
+
+          DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
+
+          export ENABLED_SERVICES
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
+          export DEVSTACK_GATE_TEMPEST_REGEX="congress_tempest_tests"
+          export DEVSTACK_GATE_NEUTRON=1
+          export PROJECTS="openstack/congress $PROJECTS"
+          export PROJECTS="openstack/python-congressclient $PROJECTS"
+          export DEVSTACK_PROJECT_FROM_GIT=python-congressclient
+          # Enable congress devstack plugin.
+          DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin congress git://git.openstack.org/openstack/congress"
+          DEVSTACK_LOCAL_CONFIG+=$'\n'"CONGRESS_REPLICATED=True"
+          export DEVSTACK_LOCAL_CONFIG
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          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
+      - console-log

jenkins/jobs/projects.yaml

@@ -1259,6 +1259,11 @@
           node: ubuntu-trusty
           job-suffix: ''
           branch-override: default
+      - '{pipeline}-congress-pe-replicated{job-suffix}':
+          pipeline: gate
+          node: ubuntu-xenial
+          job-suffix: '-nv'
+          branch-override: default
 
 - project:
     name: congress-specs

zuul/layout.yaml

@@ -2464,6 +2464,9 @@ jobs:
   - name: gate-congress-python34
     branch: ^(?!stable/liberty).*$
 
+  - name: gate-congress-pe-replicated-nv
+    branch: ^(?!stable/(liberty|mitaka)).*$
+
   - name: gate-rally-dsvm-cue-rabbitmq
     voting: false
 
@@ -6112,6 +6115,7 @@ projects:
       - name: openstack-server-release-jobs
     check:
       - gate-congress-dsvm-api
+      - gate-congress-pe-replicated-nv
       - gate-murano-congress-devstack-dsvm
     gate:
       - gate-congress-dsvm-api