Merge "Disable longbow, libccnx and android-sdk jobs"

diff --git a/jjb/hicn/include-raw-hicn-docs.sh b/jjb/hicn/include-raw-hicn-docs.sh
index 6aa95f2..c97df6c 100644 (file)
--- a/jjb/hicn/include-raw-hicn-docs.sh
+++ b/jjb/hicn/include-raw-hicn-docs.sh
@@ -55,7 +55,7 @@ if [[ ${JOB_NAME} == *merge* ]]; then
         <extension>
           <groupId>org.apache.maven.wagon</groupId>
            <artifactId>wagon-webdav-jackrabbit</artifactId>
-           <version>3.3.3</version>
+           <version>2.10</version>
         </extension>
       </extensions>
     </build>
@@ -67,6 +67,6 @@ if [[ ${JOB_NAME} == *merge* ]]; then
     </distributionManagement>
   </project>
 EOF
-  ${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C
+  ${MVN} -B site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C
   cd -
 fi

diff --git a/jjb/trex/include-raw-trex-build.sh b/jjb/trex/include-raw-trex-build.sh
deleted file mode 100644 (file)
index 4fe22b5..0000000
--- a/jjb/trex/include-raw-trex-build.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash -ex
-
-# building core
-
-cd linux_dpdk
-./b configure
-./b build
-cd -
-
-cd linux
-./b configure
-./b build
-cd -
-
-# building docs
-# Commented out to trex-docs is integrated into trex repo
-
-#cd trex-doc
-#./b configure
-#./b build
-#cd -
-
-echo "*******************************************************************"
-echo "* TREX BUILD SUCCESSFULLY COMPLETED"
-echo "*******************************************************************"
-

diff --git a/jjb/trex/trex.yaml b/jjb/trex/trex.yaml
index 0d8cea9..a72634c 100644 (file)
--- a/jjb/trex/trex.yaml
+++ b/jjb/trex/trex.yaml
@@ -1,19 +1,9 @@
----
-- project:
-    name: trex
-    jobs:
-      - 'trex-verify-{stream}-{os}'
-      - 'trex-merge-{stream}-{os}'
 
-    project: 'trex'
-    os:
-      - ubuntu1404
-      - ubuntu1604
-      - centos7
+---
+# TRex project has moved to github long time ago.
+# https://github.com/cisco-system-traffic-generator/trex-core/blob/master/CONTRIBUTING.md
 
-    stream:
-      - master:
-          branch: 'master'
+# TODO: Do we even need the INFO.yaml job if fd.io git is outdated?
 
 - project:
     name: trex-view
@@ -21,92 +11,6 @@
       - project-view
     project-name: trex
 
-- job-template:
-    name: 'trex-verify-{stream}-{os}'
-
-    project-type: freestyle
-    node: '{os}-builder-4c-4g'
-    concurrent: true
-
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      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}'
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          name: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - shell:
-          !include-raw-escape: include-raw-trex-build.sh
-
-    publishers:
-      - lf-infra-publish
-
-- job-template:
-    name: 'trex-merge-{stream}-{os}'
-
-    project-type: freestyle
-    node: '{os}-builder-4c-4g'
-    concurrent: true
-
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      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}'
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-merged:
-          name: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - shell:
-          !include-raw-escape: include-raw-trex-build.sh
-
-    publishers:
-      - lf-infra-publish
-
 - project:
     name: trex-info
     project-name: trex

diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index bcdf512..e5af263 100644 (file)
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -137,6 +137,12 @@
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
       become: true
 
+    - name: 'Install PackageCloud'
+      command: 'gem install package_cloud'
+      # yamllint disable-line rule:line-length
+      when: ansible_distribution == 'Ubuntu'
+      become: true
+
     - name: 'Install FD.io Required CentOS 7 Packages'
       yum:
         name:

diff --git a/packer/vars/ubuntu-16.04-arm64.json b/packer/vars/ubuntu-16.04-arm64.json
index eee2734..ca38b68 100644 (file)
--- a/packer/vars/ubuntu-16.04-arm64.json
+++ b/packer/vars/ubuntu-16.04-arm64.json
@@ -1,6 +1,6 @@
 {
   "arch": "arm64",
-  "base_image": "LF - Ubuntu 16.04 LTS (arm64) [2019-12-11]",
+  "base_image": "Ubuntu 16.04 LTS (arm64) [2019-06-21]",
   "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh",
   "distro": "Ubuntu 16.04",
   "flavor": "v2-standard-1",

diff --git a/packer/vars/ubuntu-18.04.json b/packer/vars/ubuntu-18.04.json
new file mode 100644 (file)
index 0000000..a52404e
--- /dev/null
+++ b/packer/vars/ubuntu-18.04.json
@@ -0,0 +1,8 @@
+{
+  "source_ami_filter_name": "*ubuntu*18.04*",
+  "source_ami_filter_owner": "099720109477",
+  "base_image": "ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200127-161924.160",
+  "distro": "Ubuntu 18.04",
+  "ssh_user": "ubuntu",
+  "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh"
+}