Merge "Add initial unified review job for testing"

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index f5961eb..5df2442 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -8,6 +8,7 @@
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
+    python-version: python3
 
     properties:
       - lf-infra-properties:
@@ -70,6 +71,7 @@
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
+    python-version: python3
 
     properties:
       - lf-infra-properties:
@@ -109,6 +111,7 @@
           jobs: '{obj:trigger_jobs}'
 
     builders:
+      - lf-infra-pre-build
       - lf-update-java-alternatives:
           java-version: '{java-version}'
       - integration-install-robotframework
@@ -126,3 +129,59 @@
           notify-every-unstable-build: false
           send-to-individuals: true
 
+- job-template:
+    name: '{project-name}-unified-review-{stream}-test'
+    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: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          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}-docker-golang-shell-daily"
+            condition: UNSTABLE_OR_BETTER
+            predefined-parameters: |
+              UNIQUE_DOCKER_TAG=$BUILD_ID
+            block: true
+      - trigger-builds:
+         -  project: "{project-name}-{stream}-csit-{review-functionality}"
+            condition: UNSTABLE_OR_BETTER
+            predefined-parameters: |
+              UNIQUE_DOCKER_TAG=$BUILD_ID
+            block: true
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**/{project}/**'
+    publishers:
+      - lf-infra-publish
+

diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml
index 7c13ebe..0b9834a 100644 (file)
--- a/jjb/music/music-distributed-kv-store-csit.yaml
+++ b/jjb/music/music-distributed-kv-store-csit.yaml
@@ -2,13 +2,18 @@
 - project:
     name: music-distributed-kv-store-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'music'
-    disabled: true
+      - '{project-name}-unified-review-{stream}-test'
+    project-name: 'music-distributed-kv-store'
+    project: 'music/distributed-kv-store'
     stream: 'master'
+    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':
-          trigger_jobs: 'music-distributed-kv-store-master-docker-golang-shell-daily'
+          trigger_jobs:
+    review-functionality: 'music-distributed-kv-store-test-plan'
     robot-options: ''
     branch: 'master'