Merge "Fix publisher macro causing JJB 2.5.0 errors"

diff --git a/jenkins-scripts/basic_settings.sh b/jenkins-scripts/basic_settings.sh
index 56ae20d..86d6725 100755 (executable)
--- a/jenkins-scripts/basic_settings.sh
+++ b/jenkins-scripts/basic_settings.sh
@@ -55,7 +55,7 @@ Host 10.30.48.* 10.30.49.*
 EOSSH
 
 cat <<EOKNOWN >  /etc/ssh/ssh_known_hosts
-[gerrit.fd.io]:29418,[162.253.54.31]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC76FxV43JIk/HpI5JUZfizmak9znK/QzsjPoNHt/Eo2Vp68kvJIRZ+PzI7RJR0NsdsXlyqzRsGuH+Cj99ZuLVjNMqz1Y1A5y6itYAgT42KDcnV/JoPx6WV+THdQ+oMSp2dINtvD1kc6Om8iAA2CwYOfIZ/FQS5A9OX2xzFopo4qAN3nRk9kpcHyC698R5SDNZBbk6eqlsBz0827KJrSpOSEEMBhtroBM4JV8vImcSWeJuQ5QFdZgQdQaI8R5YFBRbWu3mDSgJfjJk89xT2CkUiqIynNJeiQMM4IZxcdQB3zJ1RUEJepxv77yV09NZ8jwhaN6X659UJZjsCZ5ffvc77
+[gerrit.fd.io]:29418,[52.10.107.188]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjr1oez076EFMo5n25lAJ2zhftLAHIkTmwTdjwR82xA8sqQbN0FMz4znZyO7o2jlewlw/OqnVAwEIvEto6tqoj1zu8bHS1Vwq4toKkk3SLzRdn8NeTL3K92IkEHhBfB7MGtDFnbKxGmC/MmcP7sUb3MUY9EyInP1ZBVDT8S1wZ0lfcQoMVraM5G3ShmoR9FNszv1EQzbg/b9EAKuZZLXoyd6NZ2OHjBOrQzbBW9/MtYQHq60m2znOq49/gpTano5EeIHgUFfrf30qZCvL3qcFZspkofpYHB7YsRz/87YAhZorQo7E5uyNKu4CMWkj3Y8JxUAdYYbuAZqFbVE7eTGl5
 EOKNOWN
 
 # vim: sw=2 ts=2 sts=2 et :

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index 7ce067a..249b093 100644 (file)
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -1,9 +1,17 @@
 ---
+- project:
+    name: ci-management-ci-jobs
+    jobs:
+      - '{project-name}-ci-jobs'
+
+    project: ci-management
+    project-name: ci-management
+    build-node: centos7-builder-2c-2g
+    jjb-version: 2.6.0
+
 - project:
     name: ci-management-jobs
     jobs:
-      - 'ci-management-verify-jjb'
-      - 'ci-management-merge-jjb'
       - 'ci-management-verify-packer'
       - 'ci-management-merge-packer-{platforms}-{templates}'
 

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 19bcce1..3da72e9 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -1026,7 +1026,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 16 * * *'
+      - timed: '0 16 * * 1,3,5'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -1094,7 +1094,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 2,16 * * *'
+      - timed: '0 16 * * 1,3,5'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -1162,7 +1162,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 2,16 * * *'
+      - timed: '0 16 * * 1,3,5'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -1230,7 +1230,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 2,16 * * *'
+      - timed: '0 16 * * 1,3,5'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'

diff --git a/jjb/dmm/include-raw-dmm-csit-functional-virl.sh b/jjb/dmm/include-raw-dmm-csit-functional-virl.sh
index 715601a..444d261 100644 (file)
--- a/jjb/dmm/include-raw-dmm-csit-functional-virl.sh
+++ b/jjb/dmm/include-raw-dmm-csit-functional-virl.sh
@@ -26,7 +26,7 @@ fi
 mkdir -p ./csit/dmm/
 
 # Move the dmm to the csit dir
-rsync -av --progress --exclude="csit" . ./csit/dmm/
+rsync -av --progress --exclude="./csit" . ./csit/dmm/
 
 cd csit
 

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index c1203c8..48bb40f 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -11,5 +11,10 @@
     build-timeout: 360
     build-perf-timeout: 5760
 
+    # global-jjb
+    gerrit-server-name: gerrit.fd.io
+    jenkins-ssh-credential: jenkins-gerrit-credentials
+    lftools-version: <1.0.0
+
     # fd.io branch defaults
     branch: master

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index ee4781e..454a828 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -856,7 +856,7 @@
           description: "Duration of a trial measurement in BMRR tests."
       - string:
           name: CSIT_PERF_TRIAL_MULTIPLICITY
-          default: "30"
+          default: "8"
           description: "Number of subsamples for BMRR tests."
       - stream-parameter:
           stream: '{stream}'
@@ -897,12 +897,12 @@
     publishers:
       - archive-artifacts:
           artifacts: >
-            **/csit_new/*.*,
-            **/csit_parent/*.*
+            **/csit_new/**/*.*,
+            **/csit_parent/**/*.*
           latest-only: false
 
       - robot-report:
-          output-path: 'csit_new/'
+          output-path: 'csit_new/0/'
 
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'