Remove nexus artifact upload from arm master merge

Change-Id: I80521e4fdba3932e9f7994f3acc8f0a10d5b87bc
Signed-off-by: juraj.linkes <[email protected]>

diff --git a/jjb/vpp/include-raw-vpp-parallel-vars.sh b/jjb/vpp/include-raw-vpp-parallel-vars.sh
index 0926452..c0d2e4b 100644 (file)
--- a/jjb/vpp/include-raw-vpp-parallel-vars.sh
+++ b/jjb/vpp/include-raw-vpp-parallel-vars.sh
@@ -15,7 +15,7 @@ else
         fi
     done
 
-    if [[ $NODE_LABEL == 'ubuntu1804arm-us' ]]
+    if [[ $NODE_LABEL == ubuntu*arm-* ]]
     then
         CORES=16
     fi

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 6f5a0e2..6d8194f 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -122,7 +122,7 @@
     name: vpp-arm-old
     jobs:
       - 'vpp-arm-old-verify-{stream}-{os}'
-      - 'vpp-arm-merge-{stream}-{os}'
+      - 'vpp-arm-old-merge-{stream}-{os}'
     project: 'vpp'
     stream:
       - '1804':
@@ -393,7 +393,7 @@
           build-timeout: 120
 
     triggers:
-      - gerrit-trigger-checkstyle-nonvoting:
+      - gerrit-trigger-checkstyle:
           name: '{project}'
           branch: '{branch}'
 
@@ -486,7 +486,95 @@
           !include-raw-escape:
           - ../scripts/setup_vpp_dpdk_dev_env.sh
           - include-raw-vpp-parallel-vars.sh
-          - include-raw-vpp-arm-build.sh
+          - include-raw-vpp-arm-build-no-test.sh
+
+      - provide-maven-settings:
+          settings-file: 'vpp-settings'
+          global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.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'
+
+- job-template:
+    name: 'vpp-arm-old-merge-{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: '{stream}'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.{repo-os-part}'
+
+    scm:
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: 120
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+          name: '{project}'
+          branch: '{branch}'
+
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: '.packagecloud'
+              target: '/root'
+      - config-file-provider:
+          files:
+            - file-id: 'packagecloud_api'
+              target: '/root'
+      - maven-target:
+          maven-version: 'mvn33-new'
+          goals: '--version'
+          settings: 'vpp-settings'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+      - shell:
+          !include-raw-escape: ../scripts/setup_vpp_ubuntu_arm_test.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_vpp_dpdk_dev_env.sh
+          - include-raw-vpp-parallel-vars.sh
+          - include-raw-vpp-arm-build-no-test.sh
 
       - provide-maven-settings:
           settings-file: 'vpp-settings'