Merge "Refactor!: JJB code comply with updates to v5.x"

[ci-management.git] / jjb / integration / integration-templates-csit.yaml

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index f039447..8013af2 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -1,7 +1,7 @@
 ---
 - job-template:
     name: '{project-name}-{stream}-verify-csit-{functionality}'
-    disabled: '{disabled}'
+    disabled: false
 
     project-type: freestyle
     build-node: 'ubuntu1804-docker-8c-8g'
@@ -47,7 +47,7 @@
     builders:
       - lf-update-java-alternatives:
           java-version: '{java-version}'
-      - integration-install-robotframework
+      - integration-install-robotframework-py3
       - inject:
           properties-file: 'env.properties'
       - integration-run-test
@@ -64,7 +64,7 @@
 
 - job-template:
     name: '{project-name}-{stream}-csit-{functionality}'
-    disabled: '{disabled}'
+    disabled: false
 
     project-type: freestyle
     build-node: 'ubuntu1804-docker-8c-8g'
@@ -114,7 +114,7 @@
       - lf-infra-pre-build
       - lf-update-java-alternatives:
           java-version: '{java-version}'
-      - integration-install-robotframework
+      - integration-install-robotframework-py3
       - inject:
           properties-file: 'env.properties'
       - integration-run-test
@@ -129,7 +129,7 @@
           notify-every-unstable-build: false
           send-to-individuals: true
 
-- verification_maven_job_boiler_plate: &verification_maven_job_boiler_plate
+- _verification_maven_job_boiler_plate: &verification_maven_job_boiler_plate
     name: verification_maven_job_boiler_plate
 
     ######################
@@ -137,6 +137,7 @@
     ######################
 
     branch: master
+    build-concurrent: false
     build-days-to-keep: 30 # 30 days in case a release takes long to get approved.
     build-node: ubuntu1804-docker-8c-8g
     build-timeout: 60
@@ -156,7 +157,7 @@
     submodule-timeout: 10
     submodule-disable: false
 
-    disabled: '{disabled}'
+    disabled: false
     archive-artifacts: >
       **/*.log
       **/hs_err_*.log
@@ -171,7 +172,7 @@
     #####################
     # Job Configuration #
     #####################
-
+    concurrent: "{build-concurrent}"
     properties:
       - lf-infra-properties:
           project: '{project}'
@@ -221,13 +222,20 @@
             CONTAINER_PULL_REGISTRY={container-public-registry}
       - lf-maven-build:
           mvn-goals: "{mvn-goals}"
-      - integration-install-robotframework
+      - integration-install-robotframework-py3
       - inject:
           properties-file: 'env.properties'
       - integration-run-project-test
       - lf-provide-maven-settings-cleanup
     publishers:
+      - integration-project-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
       - lf-infra-publish
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
 
 - job-template:
     # Job template for unified review verification jobs in