Rename project-specific CSIT PoC jobs

 - remove PoC postfixes and rename the templates properly
 - update changed names to music jobs
 - add comments to identify all relevant templates as parts of
   project-specific CSIT flow
Issue-ID: INT-1794
Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Change-Id: Ib4fb99a9aeb14215346802a4aee158e0a07eb5eb

diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml
index 309a7c7..a1a051f 100644 (file)
--- a/jjb/global-templates-docker.yaml
+++ b/jjb/global-templates-docker.yaml
@@ -302,14 +302,15 @@
                 DOCKERHUB_REGISTRY=docker.io
 
 - job-template:
-    # Job template PoC for tagging snapshot docker images
+    # Job template for tagging snapshot docker images
     # identified by given unique tag as STAGING
+    # in project-specific CSIT versioning flow
     # The purpose of this job template is to run:
     #  1. login to the docker registry
     #  2. run a specified shell builder for tagging
     #
 
-    name: '{project-name}-{stream}-docker-staging-PoC'
+    name: '{project-name}-{stream}-docker-staging'
     project-type: freestyle
     node: 'ubuntu1804-docker-8c-8g'
     disabled: '{disabled}'

diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
index 0bfb0b9..d29528a 100644 (file)
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -203,8 +203,8 @@
           maven-version: '{maven-version}'
 
 - job-template:
-    # Job template PoC for building & pushing snapshot docker images
-    # for CSIT verification
+    # Job template for building and pushing uniquely tagged
+    # snapshot docker images in project-specific CSIT flow
     #
     # golangver can be set to golang110 or golang111
     # depending on what version is needed by the project
@@ -215,7 +215,7 @@
     #  2. run a specified shell builder
     #
 
-    name: '{project-name}-{stream}-golang-docker-snapshot-PoC'
+    name: '{project-name}-{stream}-golang-docker-snapshot'
     golangver: 'golang110'
     project-type: freestyle
     node: 'ubuntu1804-docker-8c-8g'

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index f538046..f07e6e4 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -130,7 +130,14 @@
           send-to-individuals: true
 
 - job-template:
-    name: '{project-name}-{stream}-project-csit-PoC'
+    # Job template for project-specific CSIT jobs
+    #
+    # The purpose of this job template is to execute
+    # project-specific CSIT test cases for docker image versions 
+    # identified by unique docker tag input parameter
+    #
+
+    name: '{project-name}-{stream}-project-csit'
     disabled: '{disabled}'
     project-type: freestyle
     build-node: 'ubuntu1804-docker-8c-8g'
@@ -186,7 +193,16 @@
           send-to-individuals: true
 
 - job-template:
-    name: '{project-name}-unified-review-{stream}-PoC'
+    # Job template for review verification jobs in 
+    # project-specific CSIT flow
+    #
+    # The purpose of this job template is to:
+    #  1. trigger snapshot docker build job
+    #  2. trigger CSIT job
+    #  3. give a verify vote to the triggering review
+    #
+
+    name: '{project-name}-review-verification-{stream}'
     disabled: '{disabled}'
     project-type: freestyle
     build-node: 'ubuntu1804-docker-8c-8g'
@@ -221,7 +237,7 @@
           global-settings-file: "{mvn-global-settings}"
           settings-file: "{mvn-settings}"
       - trigger-builds:
-         -  project: "{project-name}-{stream}-{artifact-type}-docker-snapshot-PoC"
+         -  project: "{project-name}-{stream}-{artifact-type}-docker-snapshot"
             predefined-parameters: |
               UNIQUE_DOCKER_TAG=$BUILD_TAG
               PROJECT=$PROJECT
@@ -229,7 +245,7 @@
               GERRIT_REFSPEC=$GERRIT_REFSPEC
             block: true
       - trigger-builds:
-         -  project: "{project-name}-{stream}-project-csit-PoC"
+         -  project: "{project-name}-{stream}-project-csit"
             predefined-parameters: |
               UNIQUE_DOCKER_TAG=$BUILD_TAG
               PROJECT=$PROJECT
@@ -246,7 +262,17 @@
       - lf-infra-publish
 
 - job-template:
-    name: '{project-name}-unified-merge-{stream}-PoC'
+    # Job template for merge verification jobs in 
+    # project-specific CSIT flow
+    #
+    # The purpose of this job template is to trigger
+    # the following jobs in sequence:
+    #  1. snapshot docker build job
+    #  2. CSIT job
+    #  3. docker staging job
+    #
+
+    name: '{project-name}-merge-verification-{stream}'
     disabled: '{disabled}'
     project-type: freestyle
     build-node: 'ubuntu1804-docker-8c-8g'
@@ -281,7 +307,7 @@
           global-settings-file: "{mvn-global-settings}"
           settings-file: "{mvn-settings}"
       - trigger-builds:
-         -  project: "{project-name}-{stream}-{artifact-type}-docker-snapshot-PoC"
+         -  project: "{project-name}-{stream}-{artifact-type}-docker-snapshot"
             predefined-parameters: |
               UNIQUE_DOCKER_TAG=$BUILD_TAG
               PROJECT=$PROJECT
@@ -289,7 +315,7 @@
               GERRIT_REFSPEC=$GERRIT_REFSPEC
             block: true
       - trigger-builds:
-         -  project: "{project-name}-{stream}-project-csit-PoC"
+         -  project: "{project-name}-{stream}-project-csit"
             predefined-parameters: |
               UNIQUE_DOCKER_TAG=$BUILD_TAG
               PROJECT=$PROJECT
@@ -297,7 +323,7 @@
               GERRIT_REFSPEC=$GERRIT_REFSPEC
             block: true
       - trigger-builds:
-         -  project: "{project-name}-{stream}-docker-staging-PoC"
+         -  project: "{project-name}-{stream}-docker-staging"
             predefined-parameters: |
               UNIQUE_DOCKER_TAG=$BUILD_TAG
               PROJECT=$PROJECT

diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml
index 52e3670..4dd27b6 100644 (file)
--- a/jjb/music/music-distributed-kv-store-csit.yaml
+++ b/jjb/music/music-distributed-kv-store-csit.yaml
@@ -2,9 +2,9 @@
 - project:
     name: music-distributed-kv-store-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-PoC'
-      - '{project-name}-unified-review-{stream}-PoC'
-      - '{project-name}-unified-merge-{stream}-PoC'
+      - '{project-name}-{stream}-project-csit'
+      - '{project-name}-review-verification-{stream}'
+      - '{project-name}-merge-verification-{stream}'
     project-name: 'music-distributed-kv-store'
     project: 'music/distributed-kv-store'
     stream: 'master'

diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml
index d01f599..6812484 100644 (file)
--- a/jjb/music/music-distributed-kv-store.yaml
+++ b/jjb/music/music-distributed-kv-store.yaml
@@ -9,10 +9,10 @@
       - '{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':
+      - '{project-name}-{stream}-golang-docker-snapshot':
           script:
             !include-raw-escape: 'build-music-distributed-kv-store-image.sh'
-      - '{project-name}-{stream}-docker-staging-PoC':
+      - '{project-name}-{stream}-docker-staging':
           script:
             !include-raw-escape: 'tag-music-distributed-kv-store-image-staging.sh'
     project: 'music/distributed-kv-store'