From 78508ccfafbe7c87c79ee9d77af9b3efbebe6848 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sat, 11 Nov 2017 01:15:42 +0100 Subject: [PATCH] Fix Functest Docker multijob MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It mainly fixes the project names in the multijob and removes the triggers added by "Add build triggers and source code management" [1]. It should be noted that creating manifest shouldn't be done via one job per arch. [1] https://gerrit.opnfv.org/gerrit/#/c/46789/ Change-Id: I2cb078ffb900513d4404a39936703844916d84e4 Signed-off-by: Cédric Ollivier --- jjb/releng/functest-docker.yml | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/jjb/releng/functest-docker.yml b/jjb/releng/functest-docker.yml index dff08fe58..6c131604b 100644 --- a/jjb/releng/functest-docker.yml +++ b/jjb/releng/functest-docker.yml @@ -100,47 +100,47 @@ name: 'build-base-img-create-manifest' execution-type: SEQUENTIAL projects: - - name: 'functest-core-build-push-{stream}' + - name: 'functest-core-build-push-{arch_tag}-{stream}' <<: *build-job-settings - - name: 'functest-core-create-manifest-{stream}' + - name: 'functest-core-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings - multijob: name: 'build-child-img' condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'functest-healthcheck-build-push-{stream}' + - name: 'functest-healthcheck-build-push-{arch_tag}-{stream}' <<: *build-job-settings - - name: 'functest-features-build-push-{stream}' + - name: 'functest-features-build-push-{arch_tag}-{stream}' <<: *build-job-settings - - name: 'functest-components-build-push-{stream}' + - name: 'functest-components-build-push-{arch_tag}-{stream}' <<: *build-job-settings - - name: 'functest-parser-build-push-{stream}' + - name: 'functest-parser-build-push-{arch_tag}-{stream}' <<: *build-job-settings - - name: 'functest-smoke-build-push-{stream}' + - name: 'functest-smoke-build-push-{arch_tag}-{stream}' <<: *build-job-settings - - name: 'functest-vnf-build-push-{stream}' + - name: 'functest-vnf-build-push-{arch_tag}-{stream}' <<: *build-job-settings - - name: 'functest-restapi-build-push-{stream}' + - name: 'functest-restapi-build-push-{arch_tag}-{stream}' <<: *build-job-settings - multijob: name: 'create-img-manifest' condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'functest-healthcheck-create-manifest-{stream}' + - name: 'functest-healthcheck-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings - - name: 'functest-features-create-manifest-{stream}' + - name: 'functest-features-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings - - name: 'functest-components-create-manifest-{stream}' + - name: 'functest-components-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings - - name: 'functest-parser-create-manifest-{stream}' + - name: 'functest-parser-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings - - name: 'functest-smoke-create-manifest-{stream}' + - name: 'functest-smoke-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings - - name: 'functest-vnf-create-manifest-{stream}' + - name: 'functest-vnf-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings - - name: 'functest-restapi-create-manifest-{stream}' + - name: 'functest-restapi-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings publishers: @@ -170,10 +170,6 @@ scm: - git-scm - triggers: - - pollscm: - cron: "*/30 * * * *" - publishers: - 'functest-{arch_tag}-recipients' @@ -209,10 +205,6 @@ scm: - git-scm - triggers: - - pollscm: - cron: "*/30 * * * *" - publishers: - 'functest-{arch_tag}-recipients' -- 2.16.6