Merge "VPP: Remove unused cpoc and promote jobs"

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index 823c6cc..6625a30 100644 (file)
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -253,7 +253,7 @@
             server-name: 'Primary'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
                     exclude-no-code-change: 'false'
                 - draft-published-event

diff --git a/jjb/csit/include-raw-csit-cpta.sh b/jjb/csit/include-raw-csit-cpta.sh
index db37feb..7775857 100644 (file)
--- a/jjb/csit/include-raw-csit-cpta.sh
+++ b/jjb/csit/include-raw-csit-cpta.sh
@@ -12,8 +12,7 @@ set -xe -o pipefail
 
 cd ${DOC_DIR}
 chmod +x ./run_cpta.sh
-./run_cpta.sh
-retval=$?
+STATUS=$(./run_cpta.sh | tail -1)
 
 cd ${WORKSPACE}
 
@@ -53,8 +52,8 @@ ${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}"
 
 cd -
 
-
-if [ ${retval} -ne "0" ]; then
-  echo "FAIL"
+if [ ${STATUS} == "PASS" ]; then
+    exit 0
+else
+    exit 1
 fi
-exit ${retval}
\ No newline at end of file

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index e1b1efa..259d131 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -179,7 +179,7 @@
             server-name: 'Primary'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
                     exclude-no-code-change: 'false'
                 - draft-published-event
@@ -201,7 +201,7 @@
             server-name: 'Primary'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
                     exclude-no-code-change: 'true'
                 - draft-published-event
@@ -240,7 +240,7 @@
             server-name: 'Primary'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
                     exclude-no-code-change: 'true'
                 - draft-published-event