diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-02-14 15:07:44 +0100 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-02-14 15:07:44 +0100 |
commit | 876cd53e23632d587dc1229fa29ade3352ccae7c (patch) | |
tree | 0a2ad5a6a23691eee5f9c5c53fb084bd5be8b42e /jjb/functest/xtesting-pi.yaml | |
parent | f0aa868797052e91262aeef09c6e5c97f263af49 (diff) |
Reorder jjb to allow us to only build containers
It's required for the new Functest K8s tags.
Change-Id: I5a924077e10bef703a946ea952d04c8fa0981329
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest/xtesting-pi.yaml')
-rw-r--r-- | jjb/functest/xtesting-pi.yaml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml index 8f9236bb3..2ed3d00be 100644 --- a/jjb/functest/xtesting-pi.yaml +++ b/jjb/functest/xtesting-pi.yaml @@ -1,7 +1,10 @@ --- -- xtesting-pi-jobs: &xtesting-pi-jobs - name: 'xtesting-pi-jobs' - current-parameters: true +- xtesting-pi-containers: &xtesting-pi-containers + name: 'xtesting-pi-containers' + repo: '{repo}' + port: '{port}' + container: '{container}' + tag: '{tag}' - xtesting-pi-params: &xtesting-pi-params name: 'xtesting-pi-params' @@ -45,6 +48,10 @@ - arm64-hunter: slave: lf-virtual1 +- xtesting-pi-jobs: &xtesting-pi-jobs + name: 'xtesting-pi-jobs' + current-parameters: true + - parameter: name: xtesting-pi-slave parameters: @@ -59,13 +66,6 @@ name: build_tag -- xtesting-pi-containers: &xtesting-pi-containers - name: 'xtesting-pi-containers' - repo: '{repo}' - port: '{port}' - container: '{container}' - tag: '{tag}' - - xtesting-pi-run-containers: &xtesting-pi-run-containers name: 'xtesting-pi-run-containers' <<: *xtesting-pi-containers @@ -128,7 +128,6 @@ fi sudo docker rmi $image || true - - job-template: name: 'xtesting-pi-{repo}-{container}-{tag}-pull' parameters: @@ -219,6 +218,7 @@ builders: - shell: | set +x + [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true if [ "{repo}" = "_" ]; then image={container}:{tag} elif [ "{port}" = "None" ]; then |