Merge changes from topic '72816'
authorSam Hague <shague@redhat.com>
Sat, 30 Jun 2018 03:22:44 +0000 (03:22 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Sat, 30 Jun 2018 03:22:44 +0000 (03:22 +0000)
* changes:
  Rename lf-infra-lfn to just lfn
  Move views declarations to projects folders

jenkins-config/clouds/openstack/odlvex/cloud.cfg
jjb/autorelease/validate-autorelease-oxygen.yaml
jjb/autorelease/view-autorelease-oxygen.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/integration/integration-deploy-openstack-run-test.sh
jjb/integration/integration-test-jobs.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/packaging/build-rpm.sh
jjb/packaging/packaging.yaml

index b53023b6258c9ebb6c3950f4083ea5da2044bb2c..2627fc375f7136ed735fd1d262f4dbb5eb3374b9 100644 (file)
@@ -10,7 +10,7 @@ HARDWARE_ID=v1-standard-1
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
 USER_DATA_ID=jenkins-init-script
 INSTANCE_CAP=75
-SANDBOX_CAP=6
+SANDBOX_CAP=8
 FLOATING_IP_POOL=
 SECURITY_GROUPS=default
 AVAILABILITY_ZONE=ca-ymq-2
index cc5bdf577e246a0ad4404d432f411d726f559186..06bad80366063d4328e0d198b5a1513bf415edd4 100644 (file)
@@ -61,6 +61,8 @@
           project: p4plugin
       - packetcable:
           project: packetcable
+      - serviceutils:
+          project: serviceutils
       - sfc:
           project: sfc
       - snmp:
index 1f79bad88b32ba74cd3cfdc1b1c82015c6f695cf..9138f0ea321cf57602d8d0c25f4c1c0de48a6fc1 100644 (file)
@@ -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'
index 56ab3272c4899897af5c4c6482a0cf64e987a123..36beac1219ae0e030beb5706778d4b79732d31b4 100644 (file)
@@ -5,13 +5,9 @@
       - inttest-csit-3node
       - inttest-csit-verify-3node
 
-    # The project name
     project: 'controller'
-
-    # The functionality under test
     functionality: 'clustering'
 
-    # Project branches
     stream:
       - fluorine:
           branch: 'master'
       - all:
           scope: 'all'
 
-    # No tools system VMs needed in JCloud configuration
     tools_system_count: 0
 
-    # Features to install
     install-features: >
-        odl-restconf-noauth,
+        odl-restconf,
         odl-clustering-test-app
-
-    # Robot custom options
-    robot-options: ''
index d155edb2ea54ee7f3fb480775310aead7fc5a3e8..2b6f7fde741071053a94a1f3508835e04973331f 100644 (file)
@@ -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
index 0a7cd1b6bd0fc5c1a5cb09fb1e946c1eaa6a21d3..b0cee6bb8fe6cb44c3ee071656ff9561680c2f9e 100644 (file)
@@ -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}'
index c17dee868ab736cc2186fac4250e93ee1c4fa262..6e7ecc2baa547ff2e4920902f96eb4f52eed1264 100644 (file)
       - 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:
index 4504640e80fe656a2465782269fa5e5782a353c0..fbfb903dbe6b8582701b5437b7546fe4a55d467a 100644 (file)
       - 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}
index 3911cc15ac45880cbfafe51527b68b91fa63e565..4f2f0d620454fd371cd861a8d51c5675f39d1530 100644 (file)
@@ -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
index a08fd2a8ea61731028457fd85fc539b88fbde1ac..4d1c2b34a29d3953b4a82050c63474c077402d16 100644 (file)
           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}'
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180620.055735-63.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180626.171605-65.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
       - install-test-uninstall-rpm
 
     triggers:
-      - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'rpm-verify'
-          projects:
-            - project-compare-type: ANT
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: ANT
-                  branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'packages/**'
+      - gerrit-trigger-patch-submitted:
+          gerrit-server-name: '{gerrit-server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: 'packages/**'
 
     publishers:
       - lf-infra-publish
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.3-SNAPSHOT/karaf-0.8.3-20180620.173319-5.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.3-SNAPSHOT/karaf-0.8.3-20180627.184938-10.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180620.055735-63.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180626.171605-65.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm