diff options
| author |   Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2021-02-10 18:59:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2021-02-10 18:59:57 +0000 |
| commit | 511ac178072c9d4b7ec24affa4c92dfeb7fce321 (patch) | |
| tree | aa184e79082453fcae73abbb929ea442f45e6767 /jjb | |
| parent | 32b5d7e2e7fe27930fd7326853c41e4a640e7cc0 (diff) | |
| parent | 7a980db2cfba2236580e3a106f769f08f2dd0523 (diff) | |
Merge "Add centos8 jobs to hicn and cicn."
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/cicn/cicn.yaml | 2 | ||||
| -rw-r--r-- | jjb/hicn/hicn.yaml | 80 |
2 files changed, 51 insertions, 31 deletions
diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml index 5f618c627..df31eed27 100644 --- a/jjb/cicn/cicn.yaml +++ b/jjb/cicn/cicn.yaml @@ -25,7 +25,7 @@ - ubuntu2004: repo-os-part: "ubuntu.focal.main" - centos7: - repo-os-part: "centos7" + repo-os-part: "centos8" executor-arch: "x86_64" diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml index 665ae22fd..15f66acac 100644 --- a/jjb/hicn/hicn.yaml +++ b/jjb/hicn/hicn.yaml @@ -13,6 +13,29 @@ --- - project: + name: hicn-os-eol-x86_64 + jobs: + - "hicn-verify-{stream}-{os}-{executor-arch}" + - "hicn-merge-{stream}-{os}-{executor-arch}" + + project: "hicn" + os: + - centos7: + repo-os-part: "centos7" + + executor-arch: "x86_64" + + stream: + - "2009": + branch: "stable/2009" + repo-stream-part: "stable.2009" + repository-name: "hicn" + - "2005": + branch: "stable/2005" + repo-stream-part: "stable.2005" + repository-name: "hicn" + +- project: name: hicn-x86_64 jobs: - "hicn-verify-{stream}-{os}-{executor-arch}" @@ -24,24 +47,41 @@ repo-os-part: "ubuntu.bionic.main" - ubuntu2004: repo-os-part: "ubuntu.focal.main" - - centos7: - repo-os-part: "centos7" executor-arch: "x86_64" stream: - - master: + - "master": branch: "master" repo-stream-part: "master" repository-name: "hicn" + - "2009": + branch: "stable/2009" + repo-stream-part: "stable.2009" + repository-name: "hicn" - "2005": branch: "stable/2005" repo-stream-part: "stable.2005" repository-name: "hicn" - type: - - short - - long +- project: + name: hicn-os-in-master-x86_64 + jobs: + - "hicn-verify-{stream}-{os}-{executor-arch}" + - "hicn-merge-{stream}-{os}-{executor-arch}" + + project: "hicn" + os: + - centos8: + repo-os-part: "centos8" + + executor-arch: "x86_64" + + stream: + - "master": + branch: "master" + repo-stream-part: "master" + repository-name: "hicn" - project: name: hicn-aarch64 @@ -67,10 +107,6 @@ repo-stream-part: "stable.2005" repository-name: "hicn" - type: - - short - - long - - project: name: hicn-beta-x86_64 jobs: @@ -82,8 +118,8 @@ repo-os-part: "ubuntu.bionic.main" - ubuntu2004: repo-os-part: "ubuntu.focal.main" - - centos7: - repo-os-part: "centos7" + - centos8: + repo-os-part: "centos8" executor-arch: "x86_64" @@ -92,10 +128,6 @@ branch: "hicn-light-ng" repo-stream-part: "hicn-light-ng" - type: - - short - - long - - project: name: hicn-beta-aarch64 jobs: @@ -113,10 +145,6 @@ branch: "hicn-light-ng" repo-stream-part: "hicn-light-ng" - type: - - short - - long - - project: name: hicn-misc jobs: @@ -145,8 +173,8 @@ repo-os-part: "ubuntu.bionic.main" - ubuntu2004: repo-os-part: "ubuntu.focal.main" - - centos7: - repo-os-part: "centos7" + - centos8: + repo-os-part: "centos8" executor-arch: "x86_64" @@ -155,10 +183,6 @@ branch: "master" repo-stream-part: "master" - type: - - short - - long - - project: name: hicn-extras-aarch64 jobs: @@ -177,10 +201,6 @@ branch: "master" repo-stream-part: "master" - type: - - short - - long - - project: name: hicn-view views: |