Merge "Upgrade common-packer to v0.4.3"

diff --git a/INFO.yaml b/INFO.yaml
index 477e6a3..3502d6a 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -44,6 +44,11 @@ committers:
       email: 'cjac+cjcollier@colliertech.org'
       id: 'cjcollier'
       timezone: 'Unknown/Unknown'
+    - name: 'Dave Wallace'
+      company: 'cisco'
+      email: 'dwallacelf@gmail.com'
+      id: 'dwallacelf'
+      timezone: 'America/New_York'
     - name: 'Ed Kern'
       company: 'cisco'
       email: 'ejk@cisco.com'
@@ -75,8 +80,9 @@ committers:
       id: 'eball'
       timezone: 'America/Los_Angeles'
 tsc:
-    approval: 'https://wiki.fd.io/view/TSC/Meeting_Minutes'
+    # yamllint disable rule:line-length
+    approval: 'missing'
     changes:
-        - type: ''
-          name: ''
-          link: ''
+        - type: 'approval'
+          name: 'Dave Wallace'
+          link: 'http://ircbot.wl.linuxfoundation.org/meetings/fdio-meeting/2020/fdio-meeting.2020-02-06-16.01.log.html'

diff --git a/global-jjb b/global-jjb
index 93a86e0..0bc70d1 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 93a86e0271fa5fd4d1280007289e842edc558653
+Subproject commit 0bc70d1762dc88b90d4f9aa99a2f3bbf2b55b078

diff --git a/jjb/ci-management/ci-packer-jobs.yaml b/jjb/ci-management/ci-packer-jobs.yaml
index 188d745..1672c93 100644 (file)
--- a/jjb/ci-management/ci-packer-jobs.yaml
+++ b/jjb/ci-management/ci-packer-jobs.yaml
@@ -16,6 +16,7 @@
       - ubuntu-16.04
       - ubuntu-18.04
       - ubuntu-18.04-arm64
+      - ubuntu-16.04-arm64
 
     templates:
       - builder

diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index 76e2279..0e26ad9 100644 (file)
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -39,7 +39,7 @@
     name: '{project}-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -87,7 +87,7 @@
     name: '{project}-verify-image-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -148,7 +148,7 @@
     name: '{project}-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
@@ -194,7 +194,7 @@
     name: 'tldk-csit-verify-func-{stream}-{os}-virl'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
     archive-artifacts: >
       **/csit/report.html

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 1b08c06..fd4afb0 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -25,6 +25,23 @@
       - '2001':
           branch: 'stable/2001'
           repo-stream-part: 'stable.2001'
+- project:
+    name: vpp-beta
+    jobs:
+      - 'vpp-beta-verify-{stream}-{os}'
+      - 'vpp-beta-merge-{stream}-{os}'
+
+    project: 'vpp'
+    os:
+      - ubuntu2004:
+          repo-os-part: 'ubuntu.focal.main'
+      - centos8:
+          repo-os-part: 'centos8'
+
+    stream:
+      - master:
+          branch: 'master'
+          repo-stream-part: 'master'
 
 - project:
     name: vpp-clang
@@ -580,6 +597,67 @@
           max-failed-builds: 1
           fixed-delay: 90
 
+- job-template:
+    name: 'vpp-beta-verify-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}-us'
+    concurrent: true
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
+
+    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: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: 120
+
+    triggers:
+      - gerrit-trigger-manually-triggered:
+          comment-trigger-value: 'betacheck'
+          name: '{project}'
+          branch: '{branch}'
+
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_vpp_dpdk_dev_env.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/build.sh
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'
+
 - job-template:
     name: 'vpp-verify-{stream}-{os}'
 
@@ -886,6 +964,86 @@
           max-failed-builds: 1
           fixed-delay: 90
 
+- job-template:
+    name: 'vpp-beta-merge-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}-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}'
+      - 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-trigger-manually-triggered:
+          comment-trigger-value: 'betamerge'
+          name: '{project}'
+          branch: '{branch}'
+
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: '.packagecloud'
+              target: '/root'
+      - config-file-provider:
+          files:
+            - file-id: 'packagecloud_api'
+              target: '/root'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/checkstyle.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_vpp_dpdk_dev_env.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/build.sh
+      - provide-maven-settings:
+          settings-file: 'vpp-settings'
+          global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'
+
 - job-template:
     name: 'vpp-csit-verify-device-{stream}-{device-node-arch}'
     description: |

diff --git a/packer/vars/ubuntu-16.04-arm64.json b/packer/vars/ubuntu-16.04-arm64.json
new file mode 100644 (file)
index 0000000..eee2734
--- /dev/null
+++ b/packer/vars/ubuntu-16.04-arm64.json
@@ -0,0 +1,12 @@
+{
+  "arch": "arm64",
+  "base_image": "LF - Ubuntu 16.04 LTS (arm64) [2019-12-11]",
+  "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh",
+  "distro": "Ubuntu 16.04",
+  "flavor": "v2-standard-1",
+  "source_ami_filter_name": "*ubuntu*16.04*",
+  "source_ami_filter_owner": "099720109477",
+  "ssh_user": "ubuntu",
+  "vm_use_block_storage": "true",
+  "vm_image_disk_format": "raw"
+}