diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/bottlenecks/bottlenecks-ci-jobs.yml | 10 | ||||
| -rw-r--r-- | jjb/bottlenecks/bottlenecks-project-jobs.yml | 8 | ||||
| -rw-r--r-- | jjb/functest/functest-docker.yml | 10 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yml | 9 | ||||
| -rw-r--r-- | jjb/storperf/storperf-daily-jobs.yml | 6 | ||||
| -rw-r--r-- | jjb/storperf/storperf-verify-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/storperf/storperf.yml | 5 |
7 files changed, 28 insertions, 22 deletions
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml index 072117ae3..41b73a290 100644 --- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml @@ -19,8 +19,8 @@ gs-packagepath: '/{suite}' # docker tag used for version control docker-tag: 'latest' - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' gs-packagepath: '/{stream}/{suite}' @@ -49,12 +49,12 @@ slave-label: compass-baremetal-branch installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser - virtual: slave-label: compass-virtual-branch installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser # ------------------------------- # None-CI PODs @@ -63,7 +63,7 @@ # slave-label: '{pod}' # installer: joid # auto-trigger-name: 'daily-trigger-disabled' - # <<: *euphrates + # <<: *fraser # - orange-pod2: # slave-label: '{pod}' # installer: joid diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml index 93b2d913c..bebac995b 100644 --- a/jjb/bottlenecks/bottlenecks-project-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml @@ -21,6 +21,11 @@ # This is used for different test suite dependent packages storage gs-packagepath: '/{suite}' disabled: false + - fraser: &fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + gs-packagepath: '/{stream}/{suite}' + disabled: false - euphrates: branch: 'stable/{stream}' gs-pathname: '/{stream}' @@ -153,7 +158,8 @@ - string: name: PACKAGE_URL default: http://205.177.226.237:9999/bottlenecks{gs-packagepath}/ - description: "the url where we store the packages used for bottlenecks rubbos" + description: "the url where we store the packages used for bottlenecks\ + \ rubbos" #################################### # builders for bottlenecks project diff --git a/jjb/functest/functest-docker.yml b/jjb/functest/functest-docker.yml index 43fb4f045..50c7c3816 100644 --- a/jjb/functest/functest-docker.yml +++ b/jjb/functest/functest-docker.yml @@ -15,9 +15,6 @@ - fraser: branch: 'stable/{stream}' disabled: false - - euphrates: - branch: 'stable/{stream}' - disabled: false arch_tag: - 'amd64': @@ -34,7 +31,6 @@ - 'parser' - 'smoke' - 'vnf' - - 'restapi' # settings for jobs run in multijob phases build-job-settings: &build-job-settings @@ -139,10 +135,6 @@ <<: *build-job-settings - name: 'functest-vnf-docker-build-arm64-{stream}' <<: *build-job-settings - - name: 'functest-restapi-docker-build-amd64-{stream}' - <<: *build-job-settings - - name: 'functest-restapi-docker-build-arm64-{stream}' - <<: *build-job-settings - multijob: name: 'publish all manifests' condition: SUCCESSFUL @@ -160,8 +152,6 @@ <<: *manifest-job-settings - name: 'functest-vnf-docker-manifest-{stream}' <<: *manifest-job-settings - - name: 'functest-restapi-docker-manifest-{stream}' - <<: *manifest-job-settings publishers: - 'functest-amd64-recipients' diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml index 55cbc5f1d..5406bc86d 100644 --- a/jjb/releng/opnfv-docker.yml +++ b/jjb/releng/opnfv-docker.yml @@ -19,6 +19,10 @@ stream: euphrates branch: 'stable/{stream}' disabled: false + fraser: &fraser + stream: fraser + branch: 'stable/{stream}' + disabled: false storperf-receivers: &storperf-receivers receivers: > mark.beierl@emc.com @@ -134,6 +138,11 @@ project: 'functest-kubernetes' <<: *master <<: *other-receivers + # projects with jobs for fraser + - 'functest-kubernetes': + project: 'functest-kubernetes' + <<: *fraser + <<: *other-receivers # projects with jobs for euphrates - 'bottlenecks': project: 'bottlenecks' diff --git a/jjb/storperf/storperf-daily-jobs.yml b/jjb/storperf/storperf-daily-jobs.yml index 3c9e527be..fe6aebb11 100644 --- a/jjb/storperf/storperf-daily-jobs.yml +++ b/jjb/storperf/storperf-daily-jobs.yml @@ -15,8 +15,8 @@ branch: '{stream}' gs-pathname: '' docker-tag: 'latest' - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -69,7 +69,7 @@ - baremetal: slave-label: apex-baremetal-master installer: apex - <<: *euphrates + <<: *fraser ## armband CI PODs # - armband-baremetal: # slave-label: armband-baremetal diff --git a/jjb/storperf/storperf-verify-jobs.yml b/jjb/storperf/storperf-verify-jobs.yml index 7e29addb9..4d6b1740a 100644 --- a/jjb/storperf/storperf-verify-jobs.yml +++ b/jjb/storperf/storperf-verify-jobs.yml @@ -13,7 +13,7 @@ gs-pathname: '' disabled: false docker-tag: 'latest' - - euphrates: + - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml index b9f3a3679..fe5784777 100644 --- a/jjb/storperf/storperf.yml +++ b/jjb/storperf/storperf.yml @@ -13,7 +13,7 @@ gs-pathname: '' disabled: false docker-tag: 'latest' - - euphrates: + - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -32,7 +32,8 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT # yamllint disable rule:line-length - description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW." + description: "Used for overriding the GIT URL coming from Global Jenkins\ + \ configuration in case if the stuff is done on none-LF HW." # yamllint enable rule:line-length scm: |