Merge "Remove UNIMgr from N b/c of compilation failures"

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index cd0cab21d0eb9805fa679008a7eee8473fe5663a..d919fa0db48a87c8d410212e23ddc8444f59e6b1 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -10,13 +10,13 @@
     # The functionality under test
     functionality: 'basic'
 
+    # Set trigger
+    # trigger-jobs: '{project}-merge-{stream}'
+
     # Project branches
     stream:
-      - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
       - carbon:
-          branch: 'stable/carbon'
+          branch: 'master'
           jre: 'openjdk8'
           karaf-version: karaf3
           # yamllint disable-line rule:line-length

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 902fcacf84110ac129f90127db887d864f926c13..6fb143be4640119d18cb482204aa21b65de09eb5 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,29 +1,4 @@
 ---
-- project:
-    name: daexim-nitrogen
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    project: 'daexim'
-    project-name: 'daexim'
-    stream: nitrogen
-    branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'daexim-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
-
 - project:
     name: daexim-carbon
     jobs:
@@ -35,7 +10,7 @@
     project: 'daexim'
     project-name: 'daexim'
     stream: carbon
-    branch: 'stable/carbon'
+    branch: 'master'
     karaf-version: karaf3
     jdk: openjdk8
     jdks:

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 1e9005cd4577218010f5cf60dbd8d771c08ac5ef..4c22732f8158c58e061c569100a0f0b077226fd4 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -168,6 +168,17 @@
                 - compare-type: ANT
                   pattern: '{files}'
 
+# Macro: integration-csit-only
+# Operation: this macro sets a trigger on reverse job list
+# Used by: csit -only- job templates
+
+- trigger:
+    name: integration-csit-trigger
+    triggers:
+      - reverse:
+          jobs: '{jobs}'
+          result: 'success'
+
 # Macro: integration-openstack-controller-mininet
 # Operation: this macro will spin the controller and mininet vms
 # Used by: {project}-csit-* job templates

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index b71eea9d5514b5e34a8d7c887c5819717d26fa86..40cd2f1114a3667a2f5b189b92b781ca72a0f765 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -160,6 +160,11 @@
           refspec: '$PATCHREFSPEC'
           branch: 'master'
 
+    triggers:
+      # we need this for not SR projects
+      - integration-csit-trigger:
+          jobs: '{trigger-jobs}'
+
     wrappers:
       - opendaylight-infra-wrappers:
           build-timeout: '{build-timeout}'

diff --git a/jjb/packaging/include-raw-test-deb.sh b/jjb/packaging/include-raw-test-deb.sh
index 2b22fd541cfcb80b56e95d15a82997e7277162cf..f5cea65d1c2f91383a3915ac4f59e608309108ca 100644 (file)
--- a/jjb/packaging/include-raw-test-deb.sh
+++ b/jjb/packaging/include-raw-test-deb.sh
@@ -17,7 +17,7 @@ then
   # shellcheck disable=SC2154
   pkg_basename="${{PACKAGE##*/}}"
   # NB: Apt can't install directly from URL, so need this intermediary file
-  curl -o "$pkg_basename" "$PACKAGE"
+  curl -L --silent -o "$pkg_basename" "$PACKAGE"
   sudo dpkg --install ./"$pkg_basename"
 elif [[ $PACKAGE == ppa:* ]]
 then

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 86f2139cc4bf80c66dcabd7804ccac79758f7702..237c811f8f5b3845463163c454fcb38f90b8ea19 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -171,8 +171,8 @@
       - string:
           name: PACKAGE
           # yamllint disable-line rule:line-length
-          default: 'http://ftp.gwdg.de/pub/opensuse/repositories/home:/akshitajha/xUbuntu_16.04/all/opendaylight_5.0.0-1_all.deb'
-          description: 'Link to .deb file or name of custom PPA repo (ppa:odl-team/boron)'
+          default: 'https://launchpad.net/~odl-team/+archive/ubuntu/carbon/+files/opendaylight_6.0.0-1_all.deb'
+          description: 'Link to .deb file or name of custom PPA repo (ppa:odl-team/carbon)'
 
     scm:
       - integration-gerrit-scm:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index e9c317abee5f9b4d37478fdde3aecd8770e43387..54ae11bbc300de0e67b4a5337c38650d0b74bb10 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -71,6 +71,7 @@
 
     # Default Robot framework options
     robot-options: ''
+    trigger-jobs: ''
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
@@ -190,7 +191,7 @@
     # CSIT Test List Variables
     # Space seperated strings to exclude from
     # auto generated CSIT job lists
-    csit-list-blacklist: 'longevity gate sanity'
+    csit-list-blacklist: 'longevity gate sanity daexim'
 
     # Auto Generated CSIT job lists used
     # in regular distribution test jobs
@@ -233,7 +234,6 @@
         controller-csit-3node-periodic-benchmark-all-nitrogen,
         controller-csit-3node-periodic-benchmark-only-nitrogen,
         controller-csit-3node-rest-clust-cars-perf-only-nitrogen,
-        daexim-csit-1node-basic-only-nitrogen,
         didm-csit-1node-discovery-only-nitrogen,
         distribution-csit-1node-userfeatures-all-nitrogen,
         distribution-csit-1node-userfeatures-only-nitrogen,
@@ -434,7 +434,6 @@
         controller-csit-3node-periodic-benchmark-all-carbon,
         controller-csit-3node-periodic-benchmark-only-carbon,
         controller-csit-3node-rest-clust-cars-perf-only-carbon,
-        daexim-csit-1node-basic-only-carbon,
         didm-csit-1node-discovery-only-carbon,
         distribution-csit-1node-userfeatures-all-carbon,
         distribution-csit-1node-userfeatures-only-carbon,