summaryrefslogtreecommitdiffstats
path: root/jjb/integration
diff options
context:
space:
mode:
authorLasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>2020-11-17 18:54:57 +0200
committerLasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>2020-11-17 18:58:59 +0200
commitfd9769fd872cd8a43afb15d3a9dc0e9683ee3b8b (patch)
tree52a2fdf7283f37c8854d066b2d1268c592d4d565 /jjb/integration
parent99ffe469f38fdaa482b2c65b9bd313203567666d (diff)
Differentiate CSIT PoC jobs and templates
- restore {project-name}-{stream}-docker-golang-shell-daily template to its original state - separate all new templates related to CSIT redesign by "PoC" postfix - pass CSIT jobs to be triggered to the template with explicit "jobs_to_trigger" list - define UNIQUE_DOCKER_TAG as input parameter to CSIT template Issue-ID: INT-1760 Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> Change-Id: I6eef5bf407d5c89406d1b19d7d931d9d00092908
Diffstat (limited to 'jjb/integration')
-rw-r--r--jjb/integration/integration-templates-csit.yaml11
1 files changed, 6 insertions, 5 deletions
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 3ae98a29c..804598cca 100644
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -130,9 +130,8 @@
send-to-individuals: true
- job-template:
- name: '{project-name}-{stream}-project-csit-{functionality}'
+ name: '{project-name}-{stream}-project-csit-{functionality}-PoC'
disabled: '{disabled}'
-
project-type: freestyle
build-node: 'ubuntu1804-docker-8c-8g'
node: '{build-node}'
@@ -155,6 +154,8 @@
test-plan: 'plans/{functionality}'
- integration-test-options:
test-options: '{robot-options}'
+ - integration-unique-docker-tag:
+ unique-docker-tag: ''
scm:
- gerrit-trigger-scm:
@@ -187,7 +188,7 @@
send-to-individuals: true
- job-template:
- name: '{project-name}-unified-review-{stream}-test'
+ name: '{project-name}-unified-review-{stream}-PoC'
disabled: '{disabled}'
project-type: freestyle
build-node: 'ubuntu1804-docker-8c-8g'
@@ -222,7 +223,7 @@
global-settings-file: "{mvn-global-settings}"
settings-file: "{mvn-settings}"
- trigger-builds:
- - project: "{project-name}-{stream}-docker-golang-shell-daily"
+ - project: "{project-name}-{stream}-docker-golang-snapshot-PoC"
condition: UNSTABLE_OR_BETTER
predefined-parameters: |
UNIQUE_DOCKER_TAG=$BUILD_TAG
@@ -231,7 +232,7 @@
GERRIT_REFSPEC=$GERRIT_REFSPEC
block: true
- trigger-builds:
- - project: '{project-name}-{stream}-project-csit-{review-functionality}'
+ - project: "{jobs_to_trigger}"
condition: UNSTABLE_OR_BETTER
predefined-parameters: |
UNIQUE_DOCKER_TAG=$BUILD_TAG