Merge "VPP: lowering build timeout to 120"

diff --git a/INFO.yaml b/INFO.yaml
new file mode 100644 (file)
index 0000000..977ec20
--- /dev/null
+++ b/INFO.yaml
@@ -0,0 +1,76 @@
+---
+project: 'ci-management'
+project_creation_date: '2015-11-19'
+project_category: ''
+lifecycle_state: 'Incubation'
+project_lead: &ci-management_ptl
+    name: 'n/a'
+    email: 'n/a'
+    id: 'n/a'
+    company: 'n/a'
+    timezone: 'n/a'
+primary_contact: *ci-management_ptl
+issue_tracking:
+    type: 'RT'
+    url: 'helpdesk@fd.io'
+    key: ''
+mailing_list:
+    type: 'groups.io'
+    url: 'https://lists.fd.io/g/ci-management-dev'
+    tag: ''
+realtime_discussion:
+    type: 'irc'
+    server: 'freenode'
+    channel: 'fdio-infra'
+meetings:
+    - type: 'n/a'
+      agenda: 'n/a'
+      url: 'n/a'
+      server: 'n/a'
+      channel: 'n/a'
+      repeats: 'n/a'
+      time: 'n/a'
+repositories:
+    - 'ci-management'
+committers:
+    - <<: *ci-management_ptl
+    - name: 'Andrew Grimberg'
+      company: 'linuxfoundation'
+      email: 'agrimberg@linuxfoundation.org'
+      id: 'agrimberg'
+      timezone: ''
+    - name: 'C.J. Collier'
+      company: 'colliertech'
+      email: 'cjac+cjcollier@colliertech.org'
+      id: 'cjcollier'
+      timezone: ''
+    - name: 'Ed Kern'
+      company: 'cisco'
+      email: 'ejk@cisco.com'
+      id: 'ejk'
+      timezone: ''
+    - name: 'Ed Warnicke'
+      company: 'gmail'
+      email: 'hagbard@gmail.com'
+      id: 'hagbard'
+      timezone: ''
+    - name: 'Vanessa Rene Valderrama'
+      company: 'linuxfoundation'
+      email: 'vvalderrama@linuxfoundation.org'
+      id: 'valderrv'
+      timezone: ''
+    - name: 'Thanh Ha (zxiiro)'
+      company: 'gmail'
+      email: 'zxiiro@gmail.com'
+      id: 'zxiiro'
+      timezone: ''
+tsc:
+    # yamllint disable rule:line-length
+    approval: ''
+    changes:
+        - type: 'removal'
+          name: ''
+          link: ''
+        - type: 'promotion'
+          name: ''
+          link: ''

diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml
index 42a1826..507415a 100644 (file)
--- a/jjb/cicn/cicn.yaml
+++ b/jjb/cicn/cicn.yaml
@@ -306,6 +306,14 @@
         - timed: '@daily'
 
     builders:
+        - config-file-provider:
+            files:
+              - file-id: '.packagecloud'
+                target: '/home/jenkins/.packagecloud'
+        - config-file-provider:
+            files:
+              - file-id: 'packagecloud_api'
+                target: '/home/jenkins/packagecloud_api'
         - maven-target:
             maven-version: 'mvn33-new'
             goals: '--version'
@@ -323,6 +331,10 @@
             !include-raw-escape:
                 - ../scripts/maven_push_functions.sh
                 - include-raw-cicn-maven-push.sh
+        - shell:
+            !include-raw-escape:
+                - ../scripts/packagecloud_push.sh
+
     publishers:
         - archive:
             artifacts: 'longbow/build/*.rpm,longbow/build/*.deb'

diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index adc9fab..34686bb 100644 (file)
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -259,6 +259,16 @@
             jobs: 'vpp-merge-{stream}-{os},hc2vpp-merge-{stream}-{os}'
             result: 'success'
 
+    builders:
+        - config-file-provider:
+            files:
+              - file-id: '.packagecloud'
+                target: '/home/jenkins/.packagecloud'
+        - config-file-provider:
+            files:
+              - file-id: 'packagecloud_api'
+                target: '/home/jenkins/packagecloud_api'
+
     prebuilders:
         - shell:
             !include-raw-escape: include-raw-hc2vpp-integration-prebuild.sh

diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml
index 96b2c5c..9295349 100644 (file)
--- a/jjb/nsh_sfc/nsh_sfc.yaml
+++ b/jjb/nsh_sfc/nsh_sfc.yaml
@@ -346,11 +346,11 @@
         - config-file-provider:
             files:
               - file-id: '.packagecloud'
-                target: '/home/jenkins'
+                target: '/home/jenkins/.packagecloud'
         - config-file-provider:
             files:
               - file-id: 'packagecloud_api'
-                target: '/home/jenkins'
+                target: '/home/jenkins/packagecloud_api'
 
         - shell:
             !include-raw-escape: ../scripts/create_maven_env.sh

diff --git a/jjb/vpp/vpp-opensuse.yaml b/jjb/vpp/vpp-opensuse.yaml
index 59c65f3..36e2c84 100644 (file)
--- a/jjb/vpp/vpp-opensuse.yaml
+++ b/jjb/vpp/vpp-opensuse.yaml
@@ -129,7 +129,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-checkstyle-nonvoting:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index fc2c19a..ce72e45 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -735,7 +735,7 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: '90'
 
     triggers:
         - gerrit-trigger-checkstyle-nonvoting:
@@ -766,11 +766,6 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
-        - naginator:
-            rerun-unstable-builds: false
-            max-failed-builds: 1
-            fixed-delay: 90
-
 - job-template:
     name: 'vpp-csit-verify-hw-perf-{stream}'