Merge "Fix ubuntu image creation issue"

diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml
new file mode 100644 (file)
index 0000000..9f6ba67
--- /dev/null
+++ b/jjb/aaa/aaa-patch-test.yaml
@@ -0,0 +1,22 @@
+- project:
+    name: aaa-patch-test
+    jobs:
+        - '{project}-patch-test-{feature}-{stream}'
+
+    # The project name
+    project: 'aaa'
+
+    # Project branches
+    stream:
+        - carbon:
+            branch: 'master'
+            jdk: 'openjdk8'
+
+    feature:
+        - authn:
+            csit-list: >
+                aaa-csit-1node-authn-all-{stream}
+
+        - keystone:
+            csit-list: >
+                aaa-csit-1node-keystone-all-{stream}

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 3f1301a112aedf9ae97e06972d22c99472cc321e..86f981eed2eeb019b024675f344d3e41a97aab6d 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -139,10 +139,14 @@
         - shell: |
             ./scripts/fix-relativepaths.sh
 
-- builder:
+- publisher:
     # include-raw-autorelease-notify-build-failure.sh searches console log for
     # failures and emails the status to the release mailing list.
     name: opendaylight-infra-notify-status
-    builders:
-        - shell:
-            !include-raw: include-raw-autorelease-notify-build-failure.sh
+    publishers:
+      - postbuildscript:
+          builders:
+              - shell:
+                  !include-raw: include-raw-autorelease-notify-build-failure.sh
+          script-only-if-succeeded: False
+          script-only-if-failed: True

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 4a60321c14e05e2fadd6b040f003552cdb3b5a14..5ac36ad7c3499ca4c9a1a09f180591421f9d746f 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -88,12 +88,12 @@
             global-settings: 'odl-global-settings'
         - autorelease-maven-sources-post-process
         - autorelease-sys-stats
-        - opendaylight-infra-notify-status
         - shell: |
             mkdir -p archives/
             cp *.log *.prop $_
 
     publishers:
+        - opendaylight-infra-notify-status
         - archive:
             # Need to archive dependencies.log in Jenkins to provide a simple
             # way for downstream jobs to pull the latest version of this file
@@ -115,6 +115,7 @@
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
+
 - job-template:
     name: 'autorelease-project-report-{stream}'
 

diff --git a/jjb/autorelease/include-raw-autorelease-notify-build-failure.sh b/jjb/autorelease/include-raw-autorelease-notify-build-failure.sh
index 36de87e819bf1c245b34a9534b2bf9f139acad58..0cdc8a4f8072207149975fd48b072062da881c18 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-notify-build-failure.sh
+++ b/jjb/autorelease/include-raw-autorelease-notify-build-failure.sh
@@ -27,19 +27,28 @@ $BUILD_URL"
 # get console logs
 wget -O $CONSOLE_LOG ${BUILD_URL}consoleText
 
-# get the failed project or artifactid
-TEMP=`awk '/Reactor Summary:/{flag=1;next} \
-           /Final Memory:/{flag=0}flag' $CONSOLE_LOG \
-           | grep '. FAILURE \[' | awk -F'[].]' '{gsub(/ /, "", $2); print $2 }'`
+# extract the failing project or artifactid
+REACTOR_INFO=`awk '/Reactor Summary:/ { flag=1 }
+          flag {
+             if ( sub(/^\[(INFO)\]/,"") && sub(/FAILURE \[.*/,"") ) {
+                 gsub(/[[:space:]]*::[[:space:]]*/,"::")
+                 gsub(/^[[:space:]]+|[[:space:]]+$|[.]/,"")
+                 print
+             }
+          }
+          /Final Memory:/ { flag=0 }' $CONSOLE_LOG`
 
 # check for project format
-if [[ ${TEMP} =~ .*::*.*::*. ]]; then
+if [[ ${REACTOR_INFO} =~ .*::*.*::*. ]]; then
     # extract project and artifactid from full format
-         PROJECT=`echo ${TEMP} | awk -F'::' '{ print $2 }'`
-         ARTIFACTID=`echo ${TEMP} |awk -F'::' '{ print $3 }'`
+    ODL=`echo ${REACTOR_INFO} | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+$/, "", $1); print $1 }'`
+    PROJECT=`echo ${REACTOR_INFO} | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+$/, "", $2); print $2 }'`
+    ARTIFACTID=`echo ${REACTOR_INFO} | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+$/, "", $3); print $3 }'`
 else
-         # set ARTIFACTID to partial format
-         ARTIFACTID=${TEMP}
+    # set ARTIFACTID to partial format
+    ODL=""
+    PROJECT=""
+    ARTIFACTID=`echo ${REACTOR_INFO} | awk '{ gsub(/^[ \t]+|[ \t]+$/, ""); print }'`
 fi
 
 # check if remote staging is complete successfully
@@ -51,8 +60,8 @@ if [ ! -z "${ARTIFACTID}" ] && [[ "${BUILD_STATUS}" != "SUCCESS" ]]; then
     # project search pattern should handle both scenarios
     # 1. Full format:    ODL :: $PROJECT :: $ARTIFACTID
     # 2. Partial format: Building $ARTIFACTID
-    awk "/\[INFO\] Building ${ARTIFACTID} / || /ODL :: ${PROJECT} :: ${ARTIFACTID} /{flag=1;next} \
-          /Reactor Summary:/{flag=0}flag" $CONSOLE_LOG > /tmp/error_msg
+    sed -e "/\[INFO\] Building \(${ARTIFACTID} \|${ODL} :: ${PROJECT} :: ${ARTIFACTID} \)/,/Reactor Summary:/!d;//d" \
+          $CONSOLE_LOG > /tmp/error_msg
 
     if [ -z "${PROJECT}" ]; then
         PROJECT=${ARTIFACTID}
@@ -62,7 +71,7 @@ if [ ! -z "${ARTIFACTID}" ] && [[ "${BUILD_STATUS}" != "SUCCESS" ]]; then
 
     SUBJECT="[release] Autorelease ${STREAM} build failure: ${PROJECT}"
 
-    echo "${BODY}" | mail -A /tmp/error_msg -s "${SUBJECT}" "${RELEASE_EMAIL}"
+    echo "${BODY}" | mail -a /tmp/error_msg -s "${SUBJECT}" "${RELEASE_EMAIL}"
 fi
 
 rm $CONSOLE_LOG

diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index 2cefedcb952c3314065c9ca1f40d23c44159fede..92617cf5e94fdb956689f9985b2c155a56f04676 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -382,6 +382,8 @@ do
     ${SSH} "${!CONTROLLERIP}"  "tar -cf /tmp/odl${i}_karaf.log.tar /tmp/odl_log/*"
     scp "${!CONTROLLERIP}:/tmp/odl${i}_karaf.log.tar" "${WORKSPACE}/odl${i}_karaf.log.tar"
     tar -xvf ${WORKSPACE}/odl${i}_karaf.log.tar -C . --strip-components 2 --transform s/karaf/odl${i}_karaf/g
+    grep "ROBOT MESSAGE\| ERROR " odl1_karaf.log > odl${i}_err.log
+    grep "ROBOT MESSAGE\| ERROR \| WARN " odl1_karaf.log > odl${i}_err_warn.log
     rm ${WORKSPACE}/odl${i}_karaf.log.tar
 done