summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2020-11-05 15:14:38 +0100
committerMauro Sardara <msardara@cisco.com>2020-11-06 09:39:12 +0100
commit0b86d4174681ade0ff6465715e60a68892b34e0a (patch)
treed14607bb769064b03c05058f72bad34552263659
parent6891b5e79dd691ce60ae62633c1196fbd64eb20f (diff)
Add ubuntu 20.04 jobs for libparc.
Cleanup unused jobs. Signed-off-by: Mauro Sardara <msardara@cisco.com> Change-Id: I5b15c47d9003c7950f15fb3977c08da6275545fa
-rw-r--r--jjb/cicn/cicn.yaml566
1 files changed, 141 insertions, 425 deletions
diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml
index c19a06aa..6e9a93d6 100644
--- a/jjb/cicn/cicn.yaml
+++ b/jjb/cicn/cicn.yaml
@@ -1,45 +1,47 @@
---
-
- project:
- name: cicn-libparc
+ name: cicn-libparc-x86_64
jobs:
- - 'cicn-libparc-verify-{stream}-{os}'
- - 'cicn-libparc-merge-{stream}-{os}'
- - 'cicn-libparc-docs-verify-{stream}'
- - 'cicn-libparc-docs-merge-{stream}'
+ - "cicn-libparc-verify-{stream}-{os}-{executor-arch}"
+ - "cicn-libparc-merge-{stream}-{os}-{executor-arch}"
- project: 'cicn'
+ project: "cicn"
os:
- ubuntu1804:
- repo-os-part: 'ubuntu.bionic.main'
- - ubuntu1604:
- repo-os-part: 'ubuntu.xenial.main'
+ repo-os-part: "ubuntu.bionic.main"
+ - ubuntu2004:
+ repo-os-part: "ubuntu.focal.main"
- centos7:
- repo-os-part: 'centos7'
+ repo-os-part: "centos7"
+
+ executor-arch: "x86_64"
stream:
- master:
- branch: 'cframework/master'
- repo-stream-part: 'master'
+ branch: "cframework/master"
+ repo-stream-part: "master"
type:
- short
- long
- project:
- name: cicn-libparc-arm64
+ name: cicn-libparc-aarch64
jobs:
- - 'cicn-arm64-libparc-verify-{stream}-{os}'
- - 'cicn-arm64-libparc-merge-{stream}-{os}'
+ - "cicn-libparc-verify-{stream}-{os}-{executor-arch}"
+ - "cicn-libparc-merge-{stream}-{os}-{executor-arch}"
- project: 'cicn'
- stream:
- - master:
- branch: 'cframework/master'
- repo-stream-part: 'master'
+ project: "cicn"
os:
- ubuntu1804:
- repo-os-part: 'ubuntu-arm.bionic.main'
+ repo-os-part: "ubuntu-arm.bionic.main"
+
+ executor-arch: "aarch64"
+
+ stream:
+ - master:
+ branch: "cframework/master"
+ repo-stream-part: "master"
type:
- short
@@ -48,565 +50,279 @@
- project:
name: cicn-viper
jobs:
- - 'cicn-viper-verify-{stream}-{os}'
- - 'cicn-viper-merge-{stream}-{os}'
+ - "cicn-viper-verify-{stream}-{os}-{executor-arch}"
+ - "cicn-viper-merge-{stream}-{os}-{executor-arch}"
- project: 'cicn'
+ project: "cicn"
os:
- ubuntu1804:
- repo-os-part: 'ubuntu.bionic.main'
+ repo-os-part: "ubuntu.bionic.main"
+
+ executor-arch: "x86_64"
stream:
- master:
- branch: 'viper/master'
- repo-stream-part: 'master'
+ branch: "viper/master"
+ repo-stream-part: "master"
type:
- short
- long
- job-template:
- name: 'cicn-libparc-merge-{stream}-{os}'
-
- project-type: freestyle
- node: '{os}-m'
-
- 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}'
- - maven-project-parameter:
- maven: 'mvn33-new'
- - maven-exec:
- maven-version: 'mvn33-new'
- - repo-name-parameter:
- repo-name: '{repo-stream-part}.{repo-os-part}'
- - stream-parameter:
- stream: 'hicn'
- - 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:
- - reverse:
- jobs: 'cicn-longbow-merge-{stream}-ubuntu1604'
- result: 'success'
- - gerrit-trigger-patch-merged:
- name: '{project}'
- branch: '{branch}'
- - reverse:
- jobs: 'cicn-longbow-merge-{stream}-{os}'
- result: 'failure'
-
- builders:
- - config-file-provider:
- files:
- - file-id: '.packagecloud'
- target: '/root/.packagecloud'
- - config-file-provider:
- files:
- - file-id: 'packagecloud_api'
- target: '/root/packagecloud_api'
- - maven-target:
- maven-version: 'mvn33-new'
- goals: '--version'
- settings: 'cicn-settings'
- settings-type: cfp
- global-settings: 'global-settings'
- global-settings-type: cfp
- - shell:
- !include-raw-escape:
- - include-raw-cicn-libparc-build.sh
- - provide-maven-settings:
- settings-file: 'cicn-settings'
- global-settings-file: 'global-settings'
- - shell:
- !include-raw-escape:
- - ../scripts/maven_push_functions.sh
- - include-raw-cicn-maven-push.sh
- - shell:
- !include-raw-escape:
- - ../scripts/packagecloud_push.sh
-
- publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
-
-- job-template:
- name: 'cicn-libparc-verify-{stream}-{os}'
-
- project-type: freestyle
- node: '{os}-m'
- 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}'
- - 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: '{build-timeout}'
-
- triggers:
- - gerrit-trigger-patch-submitted:
- name: '{project}'
- branch: '{branch}'
-
- builders:
- - shell:
- !include-raw-escape:
- - include-raw-cicn-libparc-build.sh
-
- publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
-
-- job-template:
- name: 'cicn-libparc-docs-merge-{stream}'
-
- project-type: freestyle
- node: 'ubuntu1604-builder-8c-32g'
- concurrent: true
- archive-artifacts: 'libparc/build/documentation/*.tar'
- allow-empty: 'true'
- fingerprint: false
- only-if-success: true
- default-excludes: false
-
- 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}'
- - maven-exec:
- maven-version: 'mvn33-new'
- - 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:
- - reverse:
- jobs: 'cicn-libparc-merge-{stream}-ubuntu1604'
- result: 'success'
- - gerrit:
- server-name: 'Primary'
- trigger-on:
- - comment-added-contains-event:
- comment-contains-value: 'run-docs'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
- skip-vote:
- successful: true
- failed: true
- unstable: true
- notbuilt: true
-
- builders:
- - maven-target:
- maven-version: 'mvn33-new'
- goals: '--version'
- settings: 'vpp-settings'
- settings-type: cfp
- global-settings: 'global-settings'
- global-settings-type: cfp
- - provide-maven-settings:
- settings-file: 'cicn-settings'
- global-settings-file: 'global-settings'
- - shell:
- !include-raw-escape:
- - include-raw-cicn-libparc-docs.sh
-
- publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
-
-- job-template:
- name: 'cicn-libparc-docs-verify-{stream}'
-
- project-type: freestyle
- node: 'ubuntu1604-builder-8c-32g'
- concurrent: true
- archive-artifacts: 'libparc/build/documentation/*.tar'
- allow-empty: 'true'
- fingerprint: false
- only-if-success: true
- default-excludes: false
-
- 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}'
- - maven-exec:
- maven-version: 'mvn33-new'
- - 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-patch-submitted:
- name: '{project}'
- branch: '{branch}'
-
- builders:
- - maven-target:
- maven-version: 'mvn33-new'
- goals: '--version'
- settings: 'vpp-settings'
- settings-type: cfp
- global-settings: 'global-settings'
- global-settings-type: cfp
- - provide-maven-settings:
- settings-file: 'cicn-settings'
- global-settings-file: 'global-settings'
- - shell:
- !include-raw-escape:
- - include-raw-cicn-libparc-docs.sh
-
- publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
-
-- job-template:
- name: 'cicn-arm64-libparc-merge-{stream}-{os}'
+ name: "cicn-libparc-merge-{stream}-{os}-{executor-arch}"
project-type: freestyle
- node: '{os}arm-us'
+ node: "{os}-m"
build-discarder:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
+ 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}'
+ project: "{project}"
- gerrit-parameter:
- branch: '{branch}'
+ branch: "{branch}"
- os-parameter:
- os: '{os}'
+ os: "{os}"
- maven-project-parameter:
- maven: 'mvn33-new'
+ maven: "mvn33-new"
- maven-exec:
- maven-version: 'mvn33-new'
+ maven-version: "mvn33-new"
- repo-name-parameter:
- repo-name: '{repo-stream-part}.{repo-os-part}'
+ repo-name: "{repo-stream-part}.{repo-os-part}"
- stream-parameter:
- stream: 'hicn'
+ stream: "hicn"
- string:
name: ARCHIVE_ARTIFACTS
- default: '{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'
+ credentials-id: "jenkins-gerrit-credentials"
+ refspec: ""
+ choosing-strategy: "default"
wrappers:
- fdio-infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-merged:
- name: '{project}'
- branch: '{branch}'
+ name: "{project}"
+ branch: "{branch}"
builders:
- config-file-provider:
files:
- - file-id: '.packagecloud'
- target: '/root/.packagecloud'
+ - file-id: ".packagecloud"
+ target: "/root/.packagecloud"
- config-file-provider:
files:
- - file-id: 'packagecloud_api'
- target: '/root/packagecloud_api'
+ - file-id: "packagecloud_api"
+ target: "/root/packagecloud_api"
- maven-target:
- maven-version: 'mvn33-new'
- goals: '--version'
- settings: 'cicn-settings'
+ maven-version: "mvn33-new"
+ goals: "--version"
+ settings: "cicn-settings"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
- - shell:
- !include-raw-escape:
+ - shell: !include-raw-escape:
- include-raw-cicn-libparc-build.sh
- provide-maven-settings:
- settings-file: 'cicn-settings'
- global-settings-file: 'global-settings'
- - shell:
- !include-raw-escape:
+ settings-file: "cicn-settings"
+ global-settings-file: "global-settings"
+ - shell: !include-raw-escape:
- ../scripts/maven_push_functions.sh
- include-raw-cicn-maven-push.sh
- - shell:
- !include-raw-escape:
+ - shell: !include-raw-escape:
- ../scripts/packagecloud_push.sh
publishers:
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: "mvn33-new"
- job-template:
- name: 'cicn-arm64-libparc-verify-{stream}-{os}'
+ name: "cicn-libparc-verify-{stream}-{os}-{executor-arch}"
project-type: freestyle
- node: '{os}arm-us'
+ node: "{os}-m"
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}'
+ 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}'
+ project: "{project}"
- gerrit-parameter:
- branch: '{branch}'
+ branch: "{branch}"
- os-parameter:
- os: '{os}'
+ os: "{os}"
- string:
name: ARCHIVE_ARTIFACTS
- default: '{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'
+ credentials-id: "jenkins-gerrit-credentials"
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
wrappers:
- fdio-infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-submitted:
- name: '{project}'
- branch: '{branch}'
+ name: "{project}"
+ branch: "{branch}"
builders:
- - shell:
- !include-raw-escape:
+ - shell: !include-raw-escape:
- include-raw-cicn-libparc-build.sh
publishers:
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: "mvn33-new"
- job-template:
- name: 'cicn-viper-merge-{stream}-{os}'
+ name: "cicn-viper-merge-{stream}-{os}-{executor-arch}"
project-type: freestyle
- node: '{os}-m'
+ node: "{os}-m"
build-discarder:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
+ 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}'
+ project: "{project}"
- gerrit-parameter:
- branch: '{branch}'
+ branch: "{branch}"
- os-parameter:
- os: '{os}'
+ os: "{os}"
- maven-project-parameter:
- maven: 'mvn33-new'
+ maven: "mvn33-new"
- maven-exec:
- maven-version: 'mvn33-new'
+ maven-version: "mvn33-new"
- repo-name-parameter:
- repo-name: '{repo-stream-part}.{repo-os-part}'
+ repo-name: "{repo-stream-part}.{repo-os-part}"
- stream-parameter:
- stream: 'hicn'
+ stream: "hicn"
- string:
name: ARCHIVE_ARTIFACTS
- default: '{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'
+ credentials-id: "jenkins-gerrit-credentials"
+ refspec: ""
+ choosing-strategy: "default"
wrappers:
- fdio-infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-merged:
- name: '{project}'
- branch: '{branch}'
+ name: "{project}"
+ branch: "{branch}"
- reverse:
- jobs: 'cicn-libicnet-merge-{stream}-{os}'
- result: 'failure'
+ jobs: "cicn-libicnet-merge-{stream}-{os}"
+ result: "failure"
builders:
- config-file-provider:
files:
- - file-id: '.packagecloud'
- target: '/root/.packagecloud'
+ - file-id: ".packagecloud"
+ target: "/root/.packagecloud"
- config-file-provider:
files:
- - file-id: 'packagecloud_api'
- target: '/root/packagecloud_api'
+ - file-id: "packagecloud_api"
+ target: "/root/packagecloud_api"
- maven-target:
- maven-version: 'mvn33-new'
- goals: '--version'
- settings: 'cicn-settings'
+ maven-version: "mvn33-new"
+ goals: "--version"
+ settings: "cicn-settings"
settings-type: cfp
- global-settings: 'global-settings'
+ global-settings: "global-settings"
global-settings-type: cfp
- - shell:
- !include-raw-escape:
+ - shell: !include-raw-escape:
- include-raw-cicn-viper-build.sh
- provide-maven-settings:
- settings-file: 'cicn-settings'
- global-settings-file: 'global-settings'
- - shell:
- !include-raw-escape:
+ settings-file: "cicn-settings"
+ global-settings-file: "global-settings"
+ - shell: !include-raw-escape:
- ../scripts/maven_push_functions.sh
- include-raw-cicn-maven-push.sh
- - shell:
- !include-raw-escape:
+ - shell: !include-raw-escape:
- ../scripts/packagecloud_push.sh
publishers:
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: "mvn33-new"
- job-template:
- name: 'cicn-viper-verify-{stream}-{os}'
+ name: "cicn-viper-verify-{stream}-{os}-{executor-arch}"
project-type: freestyle
- node: '{os}-m'
+ node: "{os}-m"
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}'
+ 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}'
+ project: "{project}"
- gerrit-parameter:
- branch: '{branch}'
+ branch: "{branch}"
- os-parameter:
- os: '{os}'
+ os: "{os}"
- string:
name: ARCHIVE_ARTIFACTS
- default: '{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'
+ credentials-id: "jenkins-gerrit-credentials"
+ refspec: "$GERRIT_REFSPEC"
+ choosing-strategy: "gerrit"
wrappers:
- fdio-infra-wrappers:
- build-timeout: '{build-timeout}'
+ build-timeout: "{build-timeout}"
triggers:
- gerrit-trigger-patch-submitted:
- name: '{project}'
- branch: '{branch}'
+ name: "{project}"
+ branch: "{branch}"
builders:
- - shell:
- !include-raw-escape:
+ - shell: !include-raw-escape:
- include-raw-cicn-viper-build.sh
publishers:
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: "mvn33-new"
- project:
name: cicn-info
@@ -623,9 +339,9 @@
project-name: cicn
mvn-settings: cicn-settings
sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonarcloud-project-organization: "{sonarcloud_project_organization}"
+ sonarcloud-api-token: "{sonarcloud_api_token}"
+ sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
branch: master
build-node: centos7-builder-2c-2g
jobs: