Merge "Update Gerrit trigger to use releng macro"

diff --git a/jjb/autorelease/validate-autorelease-oxygen.yaml b/jjb/autorelease/validate-autorelease-oxygen.yaml
index cc5bdf577e246a0ad4404d432f411d726f559186..06bad80366063d4328e0d198b5a1513bf415edd4 100644 (file)
--- a/jjb/autorelease/validate-autorelease-oxygen.yaml
+++ b/jjb/autorelease/validate-autorelease-oxygen.yaml
@@ -61,6 +61,8 @@
           project: p4plugin
       - packetcable:
           project: packetcable
+      - serviceutils:
+          project: serviceutils
       - sfc:
           project: sfc
       - snmp:

diff --git a/jjb/autorelease/view-autorelease-oxygen.yaml b/jjb/autorelease/view-autorelease-oxygen.yaml
index 1f79bad88b32ba74cd3cfdc1b1c82015c6f695cf..9138f0ea321cf57602d8d0c25f4c1c0de48a6fc1 100644 (file)
--- a/jjb/autorelease/view-autorelease-oxygen.yaml
+++ b/jjb/autorelease/view-autorelease-oxygen.yaml
@@ -49,6 +49,7 @@
       - 'ovsdb-maven-merge-oxygen'
       - 'p4plugin-maven-merge-oxygen'
       - 'packetcable-maven-merge-oxygen'
+      - 'serviceutils-maven-merge-oxygen'
       - 'sfc-maven-merge-oxygen'
       - 'snmp-maven-merge-oxygen'
       - 'snmp4sdn-maven-merge-oxygen'

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 56ab3272c4899897af5c4c6482a0cf64e987a123..c4f868330e24f67cae0959087db2c755a2ec5ae3 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -26,8 +26,11 @@
     tools_system_count: 0
 
     # Features to install
+    # We do not need to explicitly install restconf here (which is not brought in by the clustering-test-app)
+    # because this project will only create the -all- job which will automatically install the compatible with
+    # all feature set. That feature set will bring in restconf, which is required by the CSIT suites. If/When
+    # the -only- version of this job is brought back, we'll need to take that in to consideration.
     install-features: >
-        odl-restconf-noauth,
         odl-clustering-test-app
 
     # Robot custom options

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index d155edb2ea54ee7f3fb480775310aead7fc5a3e8..2b6f7fde741071053a94a1f3508835e04973331f 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -11,6 +11,9 @@ SSH="ssh -t -t"
 ADMIN_PASSWORD="admin"
 OPENSTACK_MASTER_CLIENTS_VERSION="queens"
 
+pip install odltools
+odltools -V
+
 # TODO: remove this work to run changes.py if/when it's moved higher up to be visible at the Robot level
 printf "\nshowing recent changes that made it into the distribution used by this job:\n"
 $PYTHON -m pip install --upgrade urllib3

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index cfde9c0501a6f10d58bd92170efda939b0313e7a..13f6115d0a2941bb7733513d72fe4a1438b6747d 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -50,7 +50,7 @@
           csit-blacklist: >
               alto bier capwap centinel didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
               l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
-              sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd wip
+              sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd tempest wip
           csit-list: !include: csit-jobs-fluorine.lst
           csit-weekly-list: '{csit-weekly-list-fluorine}'
           csit-high-frequency-list: '{csit-high-frequency-list-fluorine}'
@@ -58,7 +58,7 @@
           branch: 'stable/oxygen'
           csit-blacklist: >
               capwap centinel didm iotdm jsonrpc lacp messaging4transport netide nic
-              ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd wip
+              ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd tempest wip
           csit-list: !include: csit-jobs-oxygen.lst
           csit-weekly-list: '{csit-weekly-list-oxygen}'
           csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index c17dee868ab736cc2186fac4250e93ee1c4fa262..6e7ecc2baa547ff2e4920902f96eb4f52eed1264 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -44,6 +44,22 @@
       - gate-tdd-wip:
           testplan: '{project}-{topology}-tdd-wip-openstack.txt'
           schedule: ''
+      - tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          schedule: '{schedule-daily}'
+      - tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-daily}'
+      - gate-tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+      - gate-tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
 
     openstack:
       - pike:

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index 4504640e80fe656a2465782269fa5e5782a353c0..fbfb903dbe6b8582701b5437b7546fe4a55d467a 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -47,3 +47,15 @@
       - upgrade:
           csit-list: >
               netvirt-csit-1node-openstack-{os-branch}-upgrade-{stream}
+      - tempest:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-tempest-stateful-{stream}
+      - cluster-tempest:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-tempest-stateful-{stream}
+      - tempest-snat-conntrack:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}
+      - cluster-tempest-snat-conntrack:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream}

diff --git a/jjb/packaging/build-rpm.sh b/jjb/packaging/build-rpm.sh
index 3911cc15ac45880cbfafe51527b68b91fa63e565..4f2f0d620454fd371cd861a8d51c5675f39d1530 100644 (file)
--- a/jjb/packaging/build-rpm.sh
+++ b/jjb/packaging/build-rpm.sh
@@ -48,16 +48,25 @@ fi
                                          direct \
                                          --download_url "$DOWNLOAD_URL"
 
-# Publish RPMs to Nexus if in production Jenkins, else host on sandbox Jenkins
-if [ "$SILO" == "sandbox" ]; then
-  echo "Not uploading RPMs to Nexus because running in sandbox"
-elif  [ "$SILO" == "releng" ]; then
+# Always allow push to scratch repos, only push to CD repos in RelEng Jenkins
+if [ "$DEPLOY_TO_REPO" == "opendaylight-epel-7-x86_64-devel" ]; then
   # Move RPMs (SRPM and noarch) to dir of files that will be uploaded to Nexus
   UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
   mkdir -p "$UPLOAD_FILES_PATH"
   cp "$HOME/rpmbuild/RPMS/noarch/"*.rpm "$_"
   cp "$HOME/rpmbuild/SRPMS/"*.rpm "$_"
 else
-  echo "Unknown Jenkins silo: $SILO"
-  exit 1
+  # Publish RPMs to CD repos if in production Jenkins, not in sandbox Jenkins
+  if [ "$SILO" == "sandbox" ]; then
+    echo "Not uploading RPMs to Nexus because running in sandbox"
+  elif  [ "$SILO" == "releng" ]; then
+    # Move RPMs (SRPM+noarch) to dir of files that will be uploaded to Nexus
+    UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
+    mkdir -p "$UPLOAD_FILES_PATH"
+    cp "$HOME/rpmbuild/RPMS/noarch/"*.rpm "$_"
+    cp "$HOME/rpmbuild/SRPMS/"*.rpm "$_"
+  else
+    echo "Unknown Jenkins silo: $SILO"
+    exit 1
+  fi
 fi

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 54dbe0f8958a50bd6eb5d1b77c9eb4b7e4aec018..35b59f4c372aabc3d96a734f4ee77f2af3a830ae 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -77,6 +77,10 @@
           name: CHANGELOG_EMAIL
           default: 'jenkins-donotreply@opendaylight.org'
           description: 'Email of person who defined RPM'
+      - string:
+          name: DEPLOY_TO_REPO
+          default: 'opendaylight-{stream}-epel-7-x86_64-devel'
+          description: 'Repository to deploy resulting package to'
 
     scm:
       - integration-gerrit-scm:
@@ -95,7 +99,7 @@
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
           mvn-version: '{mvn-version}'
-          repo-id: 'opendaylight-{stream}-epel-7-x86_64-devel'
+          repo-id: '$DEPLOY_TO_REPO'
           group-id: '{group-id}'
           upload-files-dir: '{upload-files-dir}'
           maven-repo-url: '{maven-repo-url}'