Merge "Upgrade to global-jjb v0.48.1"

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 45101e7..2383b5e 100644 (file)
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -29,7 +29,7 @@
             - -3n-dnv
             - -3n-tsh:
                 executor: 'ubuntu1804arm-us'
-                vpp-mrr-daily-periodicity: '0 14 * * 0'
+                vpp-mrr-daily-periodicity: '0 14 * * *'
       - 'csit-vpp-perf-mrr-weekly-master-{node-arch}':
           node-arch:
             - 2n-clx
@@ -54,6 +54,8 @@
     branch: 'master'
     branch-id: 'oper'
     vpp-mrr-daily-periodicity: '0 2,14 * * *'
+    csit-perf-trial-duration: "1.0"
+    csit-perf-trial-multiplicity: "10"
     stream:
       - master:
           branch: 'master'
@@ -146,6 +148,10 @@
       - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "{csit-perf-trial-duration}"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -239,6 +245,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "{csit-perf-trial-duration}"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -309,6 +319,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "{csit-perf-trial-duration}"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -464,6 +478,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "{csit-perf-trial-duration}"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -552,6 +570,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "{csit-perf-trial-duration}"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 93bf6cc..2f3f169 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -22,4 +22,8 @@
     branch: master
 
     # voting
-    skip-vote: false
\ No newline at end of file
+    skip-vote: false
+
+    # CSIT
+    csit-perf-trial-duration: 1.0
+    csit-perf-trial-multiplicity: 1

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index a953421..3a9d906 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -142,6 +142,22 @@
           # yamllint disable-line rule:line-length
           description: "GERRIT_REFSPEC parameter to override separately cloned CSIT repository, leave empty for autodetection / no override."
 
+- parameter:
+    name: csit-perf-trial-duration-parameter
+    parameters:
+      - string:
+          name: CSIT_PERF_TRIAL_DURATION
+          default: "{csit-perf-trial-duration}"
+          description: "Duration of a trial measurement in BMRR tests."
+
+- parameter:
+    name: csit-perf-trial-multiplicity-parameter
+    parameters:
+      - string:
+          name: CSIT_PERF_TRIAL_MULTIPLICITY
+          default: "{csit-perf-trial-multiplicity}"
+          description: "Number of subsamples for BMRR tests."
+
 ##### SCMS
 - scm:
     name: git-scm

diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml
index 3433272..4a6d2c1 100644 (file)
--- a/jjb/hicn/hicn.yaml
+++ b/jjb/hicn/hicn.yaml
@@ -55,16 +55,48 @@
     os: ubuntu1804
 
 - project:
-    name: hicn-sysrepo
+    name: hicn-extras
     jobs:
-      - 'hicn-sysrepo-plugin-verify-{stream}'
-      - 'hicn-sysrepo-plugin-merge-{stream}'
+      - 'hicn-extras-verify-{stream}-{os}'
+      - 'hicn-extras-build-{stream}-{os}'
     project: 'hicn'
+    os:
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
+      - ubuntu1604:
+          repo-os-part: 'ubuntu.xenial.main'
+      - centos7:
+          repo-os-part: 'centos7'
+
     stream:
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-    os: ubuntu1804
+
+    type:
+      - short
+      - long
+
+- project:
+    name: hicn-extras-arm
+    jobs:
+      - 'hicn-extras-arm-verify-{stream}-{os}'
+      - 'hicn-extras-arm-build-{stream}-{os}'
+
+    project: 'hicn'
+    os:
+      - ubuntu1804:
+          repo-os-part: 'ubuntu-arm.bionic.main'
+
+    stream:
+      - master:
+          branch: 'master'
+          repo-stream-part: 'master'
+
+    type:
+      - short
+      - long
+
 
 - project:
     name: hicn-view
@@ -460,12 +492,12 @@
     mvn-settings: hicn-settings
     mvn-version: 'mvn33-new'
     branch: master
-    build-node: ubuntu1604-basebuild-4c-4g
+    build-node: ubuntu1604-builder-4c-4g
     jobs:
       - gerrit-maven-sonar
 
 - job-template:
-    name: 'hicn-sysrepo-plugin-verify-{stream}'
+    name: 'hicn-extras-verify-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-us'
@@ -485,7 +517,7 @@
       - os-parameter:
           os: '{os}'
       - repo-name-parameter:
-          repo-name: '{repo-stream-part}.ubuntu.bionic.main'
+          repo-name: '{repo-stream-part}.{repo-os-part}'
       - stream-parameter:
           stream: '{stream}'
       - string:
@@ -508,7 +540,7 @@
           server-name: 'Primary'
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: 'verify_sysrepo'
+                comment-contains-value: 'verify-extras'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'
@@ -519,7 +551,7 @@
     builders:
       - shell:
           !include-raw-escape:
-          - include-raw-hicn-sysrepo-build.sh
+          - include-raw-hicn-extras-build.sh
 
     publishers:
       - fdio-infra-shiplogs:
@@ -530,7 +562,7 @@
           fixed-delay: 90
 
 - job-template:
-    name: 'hicn-sysrepo-plugin-merge-{stream}'
+    name: 'hicn-extras-build-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-us'
@@ -555,7 +587,7 @@
       - stream-parameter:
           stream: 'release'
       - repo-name-parameter:
-          repo-name: '{repo-stream-part}.ubuntu.bionic.main'
+          repo-name: '{repo-stream-part}.{repo-os-part}'
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -576,7 +608,7 @@
           server-name: 'Primary'
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: 'merge_sysrepo'
+                comment-contains-value: 'build-extras'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'
@@ -588,11 +620,11 @@
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
-              target: '/root'
+              target: '/root/.packagecloud'
       - config-file-provider:
           files:
             - file-id: 'packagecloud_api'
-              target: '/root'
+              target: '/root/packagecloud_api'
       - maven-target:
           maven-version: 'mvn33-new'
           goals: '--version'
@@ -602,10 +634,164 @@
           global-settings-type: cfp
       - shell:
           !include-raw-escape:
-          - include-raw-hicn-checkstyle.sh
+          - include-raw-hicn-extras-build.sh
+      - provide-maven-settings:
+          settings-file: 'hicn-settings'
+          global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/maven_push_functions.sh
+          - include-raw-hicn-maven-push.sh
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 1
+          fixed-delay: 90
+
+- job-template:
+    name: 'hicn-extras-arm-verify-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}arm-us'
+
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: 100
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - os-parameter:
+          os: '{os}'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.{repo-os-part}'
+      - stream-parameter:
+          stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+
+    scm:
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit:
+          server-name: 'Primary'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'verify-extras'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+
+          builders:
+            - shell:
+                !include-raw-escape:
+                - include-raw-hicn-extras-build.sh
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 1
+          fixed-delay: 90
+
+- job-template:
+    name: 'hicn-extras-arm-build-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}arm-us'
+
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: 100
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - os-parameter:
+          os: '{os}'
+      - maven-project-parameter:
+          maven: 'mvn33-new'
+      - maven-exec:
+          maven-version: 'mvn33-new'
+      - stream-parameter:
+          stream: 'release'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.{repo-os-part}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+
+    scm:
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit:
+          server-name: 'Primary'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'build-extras'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: '.packagecloud'
+              target: '/root/.packagecloud'
+      - config-file-provider:
+          files:
+            - file-id: 'packagecloud_api'
+              target: '/root/packagecloud_api'
+      - maven-target:
+          maven-version: 'mvn33-new'
+          goals: '--version'
+          settings: 'hicn-settings'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
       - shell:
           !include-raw-escape:
-          - include-raw-hicn-sysrepo-build.sh
+          - include-raw-hicn-extras-build.sh
       - provide-maven-settings:
           settings-file: 'hicn-settings'
           global-settings-file: 'global-settings'

diff --git a/jjb/hicn/include-raw-hicn-sysrepo-build.sh b/jjb/hicn/include-raw-hicn-extras-build.sh
similarity index 76%
rename from jjb/hicn/include-raw-hicn-sysrepo-build.sh
rename to jjb/hicn/include-raw-hicn-extras-build.sh
index 1e23ca2..bcf913b 100644 (file)
--- a/jjb/hicn/include-raw-hicn-sysrepo-build.sh
+++ b/jjb/hicn/include-raw-hicn-extras-build.sh
@@ -3,5 +3,5 @@
 set -euxo pipefail
 
 pushd scripts
-bash ./build-sysrepo.sh
+bash ./build-extras.sh
 popd

diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index 2604cc3..76e2279 100644 (file)
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -26,6 +26,8 @@
     stream:
       - master:
           branch: 'master'
+      - dev-next-socket:
+          branch: 'dev-next-socket'
 
 - project:
     name: tldk-view

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 72a0647..7c1b61f 100644 (file)
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -436,7 +436,7 @@
     project-type: freestyle
     node: ubuntu1804-us
     concurrent: false
-    archive-artifacts: '**/test/doc/build/html/*'
+    archive-artifacts: '**/build-root/build-test/doc/html/*'
     allow-empty: 'true'
     fingerprint: false
     only-if-success: true

diff --git a/jjb/vpp/include-raw-vpp-checkstyle.sh b/jjb/vpp/include-raw-vpp-checkstyle.sh
index bc1e408..7c520dd 100644 (file)
--- a/jjb/vpp/include-raw-vpp-checkstyle.sh
+++ b/jjb/vpp/include-raw-vpp-checkstyle.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # jjb/vpp/include-raw-vpp-checkstyle.sh
 
-if [ "$(grep -E '^checkstyle:' Makefile)" = "checkstyle:" ]
+if [ -n "$(grep -E '^checkstyle:' Makefile)" ]
 then
        make checkstyle
 else

diff --git a/jjb/vpp/include-raw-vpp-make-test-docs.sh b/jjb/vpp/include-raw-vpp-make-test-docs.sh
index dca1998..1f82ab5 100644 (file)
--- a/jjb/vpp/include-raw-vpp-make-test-docs.sh
+++ b/jjb/vpp/include-raw-vpp-make-test-docs.sh
@@ -2,7 +2,7 @@
 set -xe -o pipefail
 [ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
 [ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/vpp
-[ "$DOC_DIR" ] || DOC_DIR=test/doc/build/html
+[ "$DOC_DIR" ] || DOC_DIR=build-root/build-test/doc/html
 [ "$SITE_DIR" ] || SITE_DIR=build-root/docs/deploy-site
 [ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources/vpp_make_test
 [ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn"

diff --git a/jjb/vpp/include-raw-vpp-test-checkstyle.sh b/jjb/vpp/include-raw-vpp-test-checkstyle.sh
index 6cb6fac..bdc8431 100644 (file)
--- a/jjb/vpp/include-raw-vpp-test-checkstyle.sh
+++ b/jjb/vpp/include-raw-vpp-test-checkstyle.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 # jjb/vpp/include-raw-vpp-test-checkstyle.sh
 
-if [ "$(grep -E '^test-checkstyle:' Makefile)" = "test-checkstyle:" ]
+if [ -n "$(grep -E '^test-checkstyle:' Makefile)" ]
 then
        make test-checkstyle
 else
-       echo "Can't find test-checkstyle target in Makefile - skipping test checkstyle"
+       echo "Can't find test-checkstyle target in Makefile - skipping test-checkstyle"
 fi

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 42beead..4f81c6c 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -16,9 +16,6 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-      - '1901':
-          branch: 'stable/1901'
-          repo-stream-part: 'stable.1901'
       - '1904':
           branch: 'stable/1904'
           repo-stream-part: 'stable.1904'
@@ -72,7 +69,9 @@
       - 'vpp-csit-verify-device-{stream}-{device-node-arch}'
       - 'vpp-csit-verify-perf-{stream}-{node-arch}'
     project: 'vpp'
-    executor: 'vpp-csit-device'
+    os: ubuntu1804
+    device-executor: 'vpp-csit-device'
+    executor: '{os}-us'
     skip-vote: 'true'
     trigger: 'gerrit-trigger-csit-devicetest-full'
     stream:
@@ -85,11 +84,10 @@
       - '1908':
           branch: 'stable/1908'
           repo-stream-part: 'stable.1908'
-    os: ubuntu1804
     device-node-arch:
       - 1n-skx
       - 1n-tx2:
-          executor: 'vpp-csit-arm-ubuntu18'
+          device-executor: 'vpp-csit-arm-ubuntu18'
           trigger: 'gerrit-trigger-csit-devicetest-manual'
     node-arch:
       - 2n-clx
@@ -98,7 +96,8 @@
       - 3n-hsw
       - 2n-dnv
       - 3n-dnv
-      - 3n-tsh
+      - 3n-tsh:
+          executor: 'ubuntu1804arm-s'
     exclude:
       - stream: '1904'
         os: 'ubuntu1804'
@@ -851,12 +850,12 @@
       <ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>{device-executor}
               </ul>
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: '{device-executor}'
     concurrent: true
     archive-artifacts: '**/csit_current/**/*.*'
     latest-only: false
@@ -922,9 +921,16 @@
 
 - job-template:
     name: 'vpp-csit-verify-perf-{stream}-{node-arch}'
+    description: |
+      <ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
+      </ul>
 
     project-type: freestyle
-    node: '{os}-us'
+    node: '{executor}'
     concurrent: true
     archive-artifacts: >
       **/csit_current/**/*.*
@@ -950,14 +956,10 @@
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - gerrit-csit-refspec-parameter
-      - string:
-          name: CSIT_PERF_TRIAL_DURATION
-          default: "10.0"
-          description: "Duration of a trial measurement in BMRR tests."
-      - string:
-          name: CSIT_PERF_TRIAL_MULTIPLICITY
-          default: "5"
-          description: "Number of subsamples for BMRR tests."
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "10.0"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "5"
       - stream-parameter:
           stream: '{stream}'
       - string:

diff --git a/packer/common-packer b/packer/common-packer
index 8cad102..6c6ee4d 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 8cad102383fdf28db36d05298771e1b16e70cbf4
+Subproject commit 6c6ee4d08580f2524b297a7b4477294079a0ad04

diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index 915c841..31ce7f8 100644 (file)
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -154,14 +154,6 @@
       when: ansible_os_family == 'RedHat'
       become: true
 
-    - name: 'Install rake gem'
-      command: 'gem install rake'
-      become: true
-
-    - name: 'Install PackageCloud'
-      command: 'gem install package_cloud'
-      become: true
-
   roles:
     - lfit.mono-install