Merge "BUG-8266: Add apidocs feature to netconf test"

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index f128bd4d323fcb34571f51ee1a6f20597456fbd4..ffde68726a0d7fde0ce824e1ea70cfa4741aa738 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -121,6 +121,9 @@
       - shell: |
           uname -a
           df -h
+          # generate accounting summary
+          sudo LC_ALL=C /usr/lib64/sa/sa2 -A
+          sar -r
 
 - builder:
     name: autorelease-get-integration-test-variables

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index e3398db4ac9a36ed37c426f8a43f0dbcb9b9cd06..bba7d4f0b0361fd3dac1a66d2b16be6ecac0cd4e 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -106,7 +106,7 @@
       - autorelease-sys-stats
       - shell: |
           mkdir -p archives/
-          cp *.log *.prop $_
+          cp /var/log/sa/* *.log *.prop $_
 
     publishers:
       - opendaylight-infra-notify-status
@@ -116,7 +116,7 @@
           # in their builds.
           # TODO stop archiving **/*.zip once we figure out why artifacts are
           #      not deploying to Nexus
-          artifacts: 'dependencies.log, **/*.zip'
+          artifacts: 'dependencies.log, **/*.zip, /var/log/sa/*'
       - trigger-parameterized-builds:
           - project: 'integration-distribution-test-{integration-test}'
             condition: UNSTABLE_OR_BETTER

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 6468a011762f8dfe212a831f72b91ba53fed0cf8..878b59eddf14dda81bab95f2b16d8f0faa598f4c 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1366,7 +1366,7 @@
       - integration-distribution-branch:
           branch: '{branch}'
       - distribution-karaf-version:
-          karaf-version: '{karaf-version}'
+          karaf-version: 'karaf3'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - string:
@@ -1446,9 +1446,9 @@
       - trigger-builds:
           - project: '{csit-list}'
             block: true
-            predefined-parameters:
+            predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
-              KARAF_VERSION=karaf3
+              KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 12baba1dee06c5d5396fd1fd60db48815f857f39..58f5091dd7d11cbb31a3a56dec098e7c246dfa20 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -329,7 +329,7 @@
       - trigger-builds:
           - project: '{csit-list}'
             block: true
-            predefined-parameters:
+            predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
 
@@ -426,7 +426,7 @@
             - trigger-builds:
                 - project: '{csit-list}'
                   block: true
-                  predefined-parameters:
+                  predefined-parameters: |
                     BUNDLE_URL=$BUNDLE_URL
                     KARAF_VERSION=$KARAF_VERSION
 

diff --git a/jjb/integration/integration-upload-distribution.sh b/jjb/integration/integration-upload-distribution.sh
index 7da49a3482b3f9cd6df882dca99a494d60f38e58..e9e2bdf828c28cf9075947fde2c66a9a83e2e17d 100644 (file)
--- a/jjb/integration/integration-upload-distribution.sh
+++ b/jjb/integration/integration-upload-distribution.sh
@@ -22,8 +22,10 @@ echo "Uploading distribution to Nexus..."
 
 cat "${LOG_FILE}"
 
-BUNDLE_URL=$(grep "Uploaded.*${KARAF_ARTIFACT}/${BUNDLE_VERSION}.*.zip" ${LOG_FILE} || true | awk '{print $3}')
+BUNDLE_URL=$(grep "Uploaded.*${KARAF_ARTIFACT}/${BUNDLE_VERSION}.*.zip" ${LOG_FILE} | awk '{print $3}') || true
 echo "Bundle uploaded to ${BUNDLE_URL}"
 
 # Re-inject the new BUNDLE_URL for downstream jobs to pull from Nexus
-env | grep BUNDLE_ | sort | tee integration-upload-distribution.env
+cat > "${WORKSPACE}/integration-upload-distribution.env" <<EOF
+BUNDLE_URL=${BUNDLE_URL}
+EOF

diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml
index 07bf090903b0cee97d54d857c1591161aadd9973..3214911a406e420783b7c1a3a931647273badd4a 100644 (file)
--- a/jjb/netconf/netconf-cluster-stress.yaml
+++ b/jjb/netconf/netconf-cluster-stress.yaml
@@ -1,45 +1,4 @@
 ---
-- project:
-    name: netconf-csit-cluster-stress
-    jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
 
-    # The project name
-    project: 'netconf'
-
-    # The functionality under test
-    functionality: 'cluster-stress'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-      - all:
-          scope: 'all'
-
-    # Features to install
-    # odl-jolokia is added automatically just because this is a 3node job.
-    # Netconf clustered feature is installed at runtime.
-    install-features: >
-        odl-restconf,
-        odl-netconf-ssh
-
-    # Robot custom options
-    robot-options: '-v USE_NETCONF_CONNECTOR:False'
+# Fix this [0] before git-reverting this job.
+# [0] https://trello.com/c/SbOodkUt/490-int-nest-repair-netconf-cluster-stress-suite