From bc08d659e85dcd4cbb8fdcc78167a19c624d8c80 Mon Sep 17 00:00:00 2001 From: Lasse Kaihlavirta Date: Wed, 18 Nov 2020 19:47:24 +0200 Subject: Add unified merge PoC job templates - add PoC templates for unified merge and docker image STAGING jobs - unified merge job is triggered by merge submit trigger - the triggered docker build and CSIT are based on master - use the templates in music - restore the original {project-name}-{stream}-docker-golang-shell-daily music job - remove unsupported "condition" parameters from trigger-jobs - change project-specific CSIT to a single job that triggers all the plans under the project - change snapshot docker build to a single job that is named by artifact type (in music's case golang) - these changes should not be applied before integration/csit commit https://gerrit.onap.org/r/c/integration/csit/+/115170 is merged! Issue-ID: INT-1783 Signed-off-by: Lasse Kaihlavirta Change-Id: If838b264a82069504817bcf2612011c33e3d26f2 --- jjb/integration/integration-macros.yaml | 8 ++- jjb/integration/integration-templates-csit.yaml | 78 ++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 8 deletions(-) (limited to 'jjb/integration') diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index b4728463e..918d67c3f 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -70,7 +70,7 @@ - builder: name: integration-run-project-test builders: - - shell: "${WORKSPACE}/csit/run-project-csit.sh ${TESTPLAN} ${TESTOPTIONS}" + - shell: "${WORKSPACE}/csit/run-project-csit.sh ${TESTOPTIONS}" - builder: name: integration-autorelease-fix-relativepaths @@ -131,6 +131,9 @@ publishers: - robot: output-path: 'archives' + output-xml: '**/output.xml' + report-html: '**/report.html' + log-html: '**/log.html' other-files: '' unstable-threshold: '{unstable-if}' pass-threshold: '{pass-if}' @@ -141,6 +144,9 @@ publishers: - robot: output-path: 'csit/archives' + output-xml: '**/output.xml' + report-html: '**/report.html' + log-html: '**/log.html' other-files: '' unstable-threshold: '{unstable-if}' pass-threshold: '{pass-if}' diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml index 804598cca..f53804609 100644 --- a/jjb/integration/integration-templates-csit.yaml +++ b/jjb/integration/integration-templates-csit.yaml @@ -130,7 +130,7 @@ send-to-individuals: true - job-template: - name: '{project-name}-{stream}-project-csit-{functionality}-PoC' + name: '{project-name}-{stream}-project-csit-PoC' disabled: '{disabled}' project-type: freestyle build-node: 'ubuntu1804-docker-8c-8g' @@ -150,8 +150,6 @@ branch: '{branch}' refspec: 'refs/heads/{branch}' artifacts: '{archive-artifacts}' - - integration-test-plan: - test-plan: 'plans/{functionality}' - integration-test-options: test-options: '{robot-options}' - integration-unique-docker-tag: @@ -223,8 +221,7 @@ global-settings-file: "{mvn-global-settings}" settings-file: "{mvn-settings}" - trigger-builds: - - project: "{project-name}-{stream}-docker-golang-snapshot-PoC" - condition: UNSTABLE_OR_BETTER + - project: "{project-name}-{stream}-{artifact-type}-docker-snapshot-PoC" predefined-parameters: | UNIQUE_DOCKER_TAG=$BUILD_TAG PROJECT=$PROJECT @@ -232,8 +229,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC block: true - trigger-builds: - - project: "{jobs_to_trigger}" - condition: UNSTABLE_OR_BETTER + - project: "{project-name}-{stream}-project-csit-PoC" predefined-parameters: | UNIQUE_DOCKER_TAG=$BUILD_TAG PROJECT=$PROJECT @@ -249,3 +245,71 @@ publishers: - lf-infra-publish +- job-template: + name: '{project-name}-unified-merge-{stream}-PoC' + disabled: '{disabled}' + project-type: freestyle + build-node: 'ubuntu1804-docker-8c-8g' + java-version: 'openjdk11' + + properties: + - lf-infra-properties: + project: '{project}' + build-days-to-keep: '{build-days-to-keep}' + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + builders: + - lf-infra-pre-build + - lf-maven-install: + mvn-version: "{mvn-version}" + - lf-update-java-alternatives: + java-version: "{java-version}" + - lf-provide-maven-settings: + global-settings-file: "{mvn-global-settings}" + settings-file: "{mvn-settings}" + - trigger-builds: + - project: "{project-name}-{stream}-{artifact-type}-docker-snapshot-PoC" + predefined-parameters: | + UNIQUE_DOCKER_TAG=$BUILD_TAG + PROJECT=$PROJECT + BRANCH=$BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + block: true + - trigger-builds: + - project: "{project-name}-{stream}-project-csit-PoC" + predefined-parameters: | + UNIQUE_DOCKER_TAG=$BUILD_TAG + PROJECT=$PROJECT + BRANCH=$BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + block: true + - trigger-builds: + - project: "{project-name}-{stream}-docker-staging-PoC" + predefined-parameters: | + UNIQUE_DOCKER_TAG=$BUILD_TAG + PROJECT=$PROJECT + BRANCH=$BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + block: true + triggers: + - gerrit-trigger-patch-merged: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '**' + publishers: + - lf-infra-publish + -- cgit 1.2.3-korg