From 41b283b35765d6265e1b0d93033b07de40044fba Mon Sep 17 00:00:00 2001 From: Lasse Kaihlavirta Date: Wed, 16 Dec 2020 19:19:52 +0200 Subject: [PATCH] Finalize maven docker snapshot template - remove PoC postfix - add clarifying comments Issue-ID: CCSDK-3045 Signed-off-by: Lasse Kaihlavirta Change-Id: Ib577845505b8d7424d6f7a64ba78fa2c7522d408 --- jjb/ccsdk/distribution.yaml | 2 +- jjb/integration/integration-maven-jobs.yaml | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 6f0c160f0..72af19764 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -20,7 +20,7 @@ cron: '@daily' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - - gerrit-maven-docker-snapshot-PoC: + - gerrit-maven-docker-snapshot: build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-snapshot-registry: 'nexus3.onap.org:10003' diff --git a/jjb/integration/integration-maven-jobs.yaml b/jjb/integration/integration-maven-jobs.yaml index 4f5666137..259fb4ebe 100644 --- a/jjb/integration/integration-maven-jobs.yaml +++ b/jjb/integration/integration-maven-jobs.yaml @@ -1,4 +1,12 @@ +#################### +# COMMON FUNCTIONS # +#################### + - integration_maven_common: &integration_maven_common + # This common maven base template is based on + # lf-maven-common in global-jjb/jjb/lf-maven-jobs.yaml + # and adjusted for jobs in project-specific CSIT flow + name: integration-maven-common ###################### @@ -96,8 +104,12 @@ - lf-provide-maven-settings-cleanup - job-template: + # Job template for creating snapshot docker images + # identified by given unique tag with maven + # in project-specific CSIT flow + name: "{project-name}-{stream}-maven-docker-snapshot" - id: gerrit-maven-docker-snapshot-PoC + id: gerrit-maven-docker-snapshot <<: *integration_maven_common # yamllint disable-line rule:key-duplicates <<: *integration_maven_docker_snapshot -- 2.16.6