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 <l.kaihlavirt@partner.samsung.com>
Change-Id: If838b264a82069504817bcf2612011c33e3d26f2
diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml
index 71d5879..52e3670 100644
--- a/jjb/music/music-distributed-kv-store-csit.yaml
+++ b/jjb/music/music-distributed-kv-store-csit.yaml
@@ -2,18 +2,16 @@
- project:
name: music-distributed-kv-store-csit
jobs:
- - '{project-name}-{stream}-project-csit-{functionality}-PoC'
+ - '{project-name}-{stream}-project-csit-PoC'
- '{project-name}-unified-review-{stream}-PoC'
+ - '{project-name}-unified-merge-{stream}-PoC'
project-name: 'music-distributed-kv-store'
project: 'music/distributed-kv-store'
stream: 'master'
+ artifact-type: 'golang'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'music-distributed-kv-store-settings'
mvn-global-settings: global-settings
- functionality:
- - 'music-distributed-kv-store-test-plan'
- jobs_to_trigger:
- - 'music-distributed-kv-store-master-project-csit-music-distributed-kv-store-test-plan-PoC'
robot-options: ''
branch: 'master'
diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml
index 4ad0a39..d01f599 100644
--- a/jjb/music/music-distributed-kv-store.yaml
+++ b/jjb/music/music-distributed-kv-store.yaml
@@ -6,13 +6,20 @@
jobs:
- '{project-name}-{stream}-verify-golang'
- '{project-name}-{stream}-merge-golang'
- - '{project-name}-{stream}-docker-golang-snapshot-PoC':
+ - '{project-name}-{stream}-docker-golang-shell-daily':
script:
!include-raw-escape: 'build-music-distributed-kv-store-image.sh'
+ - '{project-name}-{stream}-golang-docker-snapshot-PoC':
+ script:
+ !include-raw-escape: 'build-music-distributed-kv-store-image.sh'
+ - '{project-name}-{stream}-docker-staging-PoC':
+ script:
+ !include-raw-escape: 'tag-music-distributed-kv-store-image-staging.sh'
project: 'music/distributed-kv-store'
stream:
- 'master':
branch: 'master'
+ artifact-type: 'golang'
mvn-settings: 'music-distributed-kv-store-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/music/tag-music-distributed-kv-store-image-staging.sh b/jjb/music/tag-music-distributed-kv-store-image-staging.sh
new file mode 100755
index 0000000..0c28eec
--- /dev/null
+++ b/jjb/music/tag-music-distributed-kv-store-image-staging.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo '=========== CALLING SCRIPT TO TAG DOCKER IMAGES AS STAGING ==========='
+echo "=========== Unique docker tag: ${UNIQUE_DOCKER_TAG}"
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./deployment/*.sh
+cd ./deployment
+./tag-docker-staging.sh