diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-05 13:41:46 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-05 13:56:27 +0200 |
| commit | e8ce5a2409aaca6096bea94ccb40ae2ab5c1351e (patch) | |
| tree | 591c54797a92da4ff48f07b125719d68a622033e | |
| parent | 3bc12ce487234b58c0313f24e8ced2db7615ecfd (diff) | |
Build xtesting-mts
Change-Id: I4b1c9fa04ccf287152fb166946e78f7cf4797235
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | jjb/functest/xtesting-docker.yaml | 64 |
1 files changed, 52 insertions, 12 deletions
diff --git a/jjb/functest/xtesting-docker.yaml b/jjb/functest/xtesting-docker.yaml index 1e7de5def..3371e1570 100644 --- a/jjb/functest/xtesting-docker.yaml +++ b/jjb/functest/xtesting-docker.yaml @@ -31,6 +31,20 @@ - 'arm64': slave_label: 'opnfv-build-ubuntu-arm' + image: + - 'core' + - 'mts' + + exclude: + - stream: 'kali' + image: 'mts' + - stream: 'jerma' + image: 'mts' + - stream: 'iruya' + image: 'mts' + - stream: 'hunter' + image: 'mts' + # settings for jobs run in multijob phases build-job-settings: &build-job-settings current-parameters: false @@ -56,8 +70,8 @@ # yamllint enable rule:key-duplicates jobs: - "xtesting-docker-{stream}" - - "xtesting-docker-build-{arch_tag}-{stream}" - - "xtesting-docker-manifest-{stream}" + - "xtesting-{image}-docker-build-{arch_tag}-{stream}" + - "xtesting-{image}-docker-manifest-{stream}" ######################## # job templates @@ -95,23 +109,38 @@ name: 'build xtesting images' execution-type: PARALLEL projects: - - name: 'xtesting-docker-build-amd64-{stream}' + - name: 'xtesting-core-docker-build-amd64-{stream}' <<: *build-job-settings - - name: 'xtesting-docker-build-arm64-{stream}' + - name: 'xtesting-core-docker-build-arm64-{stream}' <<: *build-job-settings - multijob: name: 'publish xtesting manifests' execution-type: PARALLEL projects: - - name: 'xtesting-docker-manifest-{stream}' + - name: 'xtesting-core-docker-manifest-{stream}' + <<: *manifest-job-settings + - multijob: + name: 'build xtesting-mts images' + execution-type: PARALLEL + projects: + - name: 'xtesting-mts-docker-build-amd64-{stream}' + <<: *build-job-settings + - name: 'xtesting-mts-docker-build-arm64-{stream}' + <<: *build-job-settings + - multijob: + name: 'publish xtesting-mts manifests' + execution-type: PARALLEL + projects: + - name: 'xtesting-mts-docker-manifest-{stream}' <<: *manifest-job-settings + publishers: - 'xtesting-amd64-recipients' - 'xtesting-arm64-recipients' - job-template: - name: 'xtesting-docker-build-{arch_tag}-{stream}' + name: 'xtesting-{image}-docker-build-{arch_tag}-{stream}' disabled: '{obj:disabled}' parameters: - xtesting-job-parameters: @@ -124,11 +153,16 @@ builders: - shell: | #!/bin/bash -ex - sudo arch={arch_tag} bash ./build.sh + case "{arch_tag}" in + "arm64") + sudo amd64_dirs= arm64_dirs=docker/{image} arm_dirs= bash ./build.sh ;; + *) + sudo amd64_dirs=docker/{image} arm64_dirs= arm_dirs= bash ./build.sh ;; + esac exit $? - job-template: - name: 'xtesting-docker-manifest-{stream}' + name: 'xtesting-{image}-docker-manifest-{stream}' parameters: - project-parameter: @@ -151,7 +185,7 @@ - string: name: REPO default: "opnfv" - description: "Repository name for functest images" + description: "Repository name for xtesting images" disabled: '{obj:disabled}' @@ -165,10 +199,16 @@ *) tag="{stream}" ;; esac + case "{image}" in + "core") + img="" ;; + *) + img="-{image}" ;; + esac sudo manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template $REPO/xtesting:ARCH-$tag \ - --target $REPO/xtesting:$tag + --template $REPO/xtesting$img:ARCH-$tag \ + --target $REPO/xtesting$img:$tag exit $? - parameter: @@ -214,7 +254,7 @@ - string: name: REPO default: "opnfv" - description: "Repository name for functest images" + description: "Repository name for xtesting images" # publisher macros - publisher: |