3 files changed, 21 insertions, 6 deletions
diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml
index 71d5879b6..52e367073 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 4ad0a39ef..d01f599e9 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 000000000..0c28eec0f
--- /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