Merge "Revert "Migrate cicn job templates to global-jjb""

diff --git a/jjb/vpp/include-gcc8-prefer.sh b/jjb/vpp/include-gcc8-prefer.sh
new file mode 100644 (file)
index 0000000..6de4beb
--- /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 9a8fb05..3f54c04 100644 (file)
--- 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:
@@ -207,6 +208,69 @@
           max-failed-builds: 1
           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}'