9 files changed, 132 insertions, 28 deletions
diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml
index 7f6054910..2cff11d3c 100644
--- a/jjb/cicn/cicn.yaml
+++ b/jjb/cicn/cicn.yaml
@@ -449,7 +449,7 @@
     name: 'cicn-longbow-docs-merge-{stream}'
 
     project-type: freestyle
-    node: '{os}-builder-8c-32g'
+    node: 'ubuntu1604-builder-8c-32g'
     concurrent: true
 
     build-discarder:
@@ -463,8 +463,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1604'
       - maven-exec:
           maven-version: 'mvn33-new'
 
@@ -528,7 +526,7 @@
     name: 'cicn-longbow-docs-verify-{stream}'
 
     project-type: freestyle
-    node: '{os}-builder-8c-32g'
+    node: 'ubuntu1604-builder-8c-32g'
     concurrent: true
 
     build-discarder:
@@ -542,8 +540,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1604'
       - maven-exec:
           maven-version: 'mvn33-new'
 
@@ -735,7 +731,7 @@
     name: 'cicn-libparc-docs-merge-{stream}'
 
     project-type: freestyle
-    node: '{os}-builder-8c-32g'
+    node: 'ubuntu1604-builder-8c-32g'
     concurrent: true
 
     build-discarder:
@@ -749,8 +745,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1604'
       - maven-exec:
           maven-version: 'mvn33-new'
 
@@ -814,7 +808,7 @@
     name: 'cicn-libparc-docs-verify-{stream}'
 
     project-type: freestyle
-    node: '{os}-builder-8c-32g'
+    node: 'ubuntu1604-builder-8c-32g'
     concurrent: true
 
     build-discarder:
@@ -828,8 +822,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1604'
       - maven-exec:
           maven-version: 'mvn33-new'
 
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 6ca79686e..063ae0d57 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -35,7 +35,7 @@
       - 'csit-docs-merge-{stream_timed}'
       - 'csit-docs-verify-{stream}'
       - 'csit-report-merge-{stream}'
-      - 'csit-report-merge-1901_1'
+      - 'csit-report-merge-1901_2'
       - 'csit-trending-daily-master'
       - 'csit-dpdk-perf-verify-{stream}-{topo}-{arch}'
       - 'csit-dpdk-perf-mrr-weekly-master'
@@ -693,7 +693,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-report-merge-1901_1'
+    name: 'csit-report-merge-1901_2'
 
     project-type: freestyle
     node: 'ubuntu1604-basebuild-8c-32g'
@@ -709,7 +709,7 @@
       - project-parameter:
           project: '{project}'
       - gerrit-parameter:
-          branch: 'rls1901_1'
+          branch: 'rls1901_2'
       - maven-exec:
           maven-version: 'mvn33-new'
 
@@ -734,7 +734,7 @@
               project-pattern: '{project}'
               branches:
                 - branch-compare-type: 'ANT'
-                  branch-pattern: '**/rls1901_1'
+                  branch-pattern: '**/rls1901_2'
           skip-vote:
             successful: true
             failed: true
@@ -1066,7 +1066,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 16 * * 1,3,5'
+      - timed: '0 16 * * *'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -1134,7 +1134,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 14 * * 1,3,5'
+      - timed: '0 2,14 * * *'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -1202,7 +1202,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 14 * * 1,3,5'
+      - timed: '0 2,14 * * *'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -1270,7 +1270,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 14 * * 1,3,5'
+      - timed: '0 2,14 * * *'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
diff --git a/jjb/csit/include-raw-csit-hc2vpp-verify-func.sh b/jjb/csit/include-raw-csit-hc2vpp-verify-func.sh
index 5237e9838..0e3c183fe 100644
--- a/jjb/csit/include-raw-csit-hc2vpp-verify-func.sh
+++ b/jjb/csit/include-raw-csit-hc2vpp-verify-func.sh
@@ -1,5 +1,26 @@
 #!/bin/bash
 
+# Parse optional arguments from gerrit comment trigger
+for i in ${GERRIT_EVENT_COMMENT_TEXT}; do
+    case ${i} in
+        *honeycomb=*)
+            hc_version=`echo "${i}" | cut -d = -f2-`
+        ;;
+        *)
+        ;;
+    esac
+done
+
+# If HC variable is set, check honeycomb version.
+if [[ -n "${hc_version}" ]]; then
+    if [[ "${hc_version}" == *"-release" ]]; then
+        # we are going to test release build. All release
+        # packages should be already present in release repo
+        STREAM="release"
+        echo "STREAM set to: ${STREAM}"
+    fi
+fi
+
 # execute csit bootstrap script if it exists
 if [[ ! -e bootstrap-hc2vpp-integration.sh ]]
 then
diff --git a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
index 1e54750b2..dc4ca43de 100644
--- a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
@@ -21,6 +21,14 @@ echo DISTRIB_RELEASE: ${DISTRIB_RELEASE}
 echo DISTRIB_CODENAME: ${DISTRIB_CODENAME}
 echo DISTRIB_DESCRIPTION: ${DISTRIB_DESCRIPTION}
 
+if [[ "$VERSION" == *"-release" ]]; then
+    # at the time when HC2VPP release packages are being build,
+    # jvpp release packages are already promoted to release repository.
+    # Therefore we need to switch to release repository in order to download
+    # correct jvpp package versions
+    STREAM="release"
+fi
+
 echo "----- DOWNLOADING PACKAGES -----"
 if ! [[ -z ${REPO_NAME} ]]; then
     REPO_URL="https://packagecloud.io/fdio/${STREAM}"
@@ -30,6 +38,10 @@ if ! [[ -z ${REPO_NAME} ]]; then
             echo "Deleting: /etc/apt/sources.list.d/99fd.io.list"
             sudo rm /etc/apt/sources.list.d/99fd.io.list
         fi
+        if ! [[ "${STREAM}" == "master" ]]; then
+            echo "stable branch - clearing all fdio repos. new one will be installed."
+            sudo rm  -f /etc/apt/sources.list.d/fdio_*.list
+        fi
         curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh | sudo bash
         if [[ "${VERSION}" != 'RELEASE' ]]; then
             # download specific version if set
diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml
index 0f53c4ba3..49c8f18f5 100644
--- a/jjb/nsh_sfc/nsh_sfc.yaml
+++ b/jjb/nsh_sfc/nsh_sfc.yaml
@@ -384,7 +384,7 @@
     name: 'nsh_sfc-verify-docs-{stream}'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: ubuntu1604-builder-4c-4g
     concurrent: true
     jdk: openjdk8-ubuntu1604
 
@@ -399,8 +399,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1604'
       - maven-exec:
           maven-version: 'mvn33-new'
 
diff --git a/jjb/scripts/setup_jvpp_dev_env.sh b/jjb/scripts/setup_jvpp_dev_env.sh
index f519dcb7b..9017f0db6 100644
--- a/jjb/scripts/setup_jvpp_dev_env.sh
+++ b/jjb/scripts/setup_jvpp_dev_env.sh
@@ -16,6 +16,17 @@ echo DISTRIB_RELEASE: $DISTRIB_RELEASE
 echo DISTRIB_CODENAME: $DISTRIB_CODENAME
 echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION
 
+JVPP_VERSION=`./version`
+echo JVPP_VERSION: $JVPP_VERSION
+# Check release version
+if [[ "$JVPP_VERSION" == *"-release" ]]; then
+    # at the time when JVPP release packages are being build,
+    # vpp release packages are already promoted to release repository.
+    # Therefore we need to switch to release repository in order to download
+    # correct vpp package versions
+    STREAM="release"
+fi
+
 function setup {
     if ! [[ -z ${REPO_NAME} ]]; then
         echo "INSTALLING VPP-DPKG-DEV from apt/yum repo"
diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index 7cdbe1cd8..2426bb9e8 100644
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -37,7 +37,7 @@
     name: '{project}-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -85,7 +85,7 @@
     name: '{project}-verify-image-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -146,7 +146,7 @@
     name: '{project}-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
@@ -192,7 +192,7 @@
     name: 'tldk-csit-verify-func-{stream}-{os}-virl'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     build-discarder:
diff --git a/jjb/vpp/include-gcc8-prefer.sh b/jjb/vpp/include-gcc8-prefer.sh
new file mode 100644
index 000000000..6de4beb40
--- /dev/null
+++ b/jjb/vpp/include-gcc8-prefer.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7 && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 74ca251c1..3f54c0461 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -85,6 +85,7 @@
     name: vpp-master-only
     jobs:
       - 'vpp-beta-verify-{stream}-{os}'
+      - 'vpp-beta-verify-gcc8-{stream}-{os}'
       - 'vpp-beta-merge-{stream}-{os}'
     project: 'vpp'
     stream:
@@ -208,6 +209,69 @@
           fixed-delay: 90
 
 - job-template:
+    name: 'vpp-beta-verify-gcc8-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}-us'
+    concurrent: true
+    triggers:
+      - gerrit-trigger-checkstyle-nonvoting:
+          name: '{project}'
+          branch: '{branch}'
+
+    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}'
+
+    scm:
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: '75'
+
+    builders:
+      - shell:
+          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+      - shell:
+          !include-raw-escape:
+          - include-gcc8-prefer.sh
+          - ../scripts/setup_vpp_dpdk_dev_env.sh
+          - include-raw-vpp-build.sh
+
+    publishers:
+      - archive:
+          artifacts: >
+            **/build-root/*.rpm,
+            **/build-root/*.deb,
+            **/dpdk/*.rpm,
+            **/dpdk/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
+          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
+
+- job-template:
     name: 'vpp-beta-merge-{stream}-{os}'
 
     project-type: freestyle
@@ -396,7 +460,7 @@
           build-timeout: 120
 
     triggers:
-      - gerrit-trigger-checkstyle:
+      - gerrit-trigger-checkstyle-nonvoting:
           name: '{project}'
           branch: '{branch}'
 
@@ -423,6 +487,10 @@
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
           archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 1
+          fixed-delay: 90
 
 - job-template:
     name: 'vpp-arm-merge-{stream}-{os}'