Chore: Revert back to ubuntu1804-docker

[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 be74858..95d8fb3 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -42,7 +42,7 @@
           server: '{server-name}'
           project: 'integration/csit'
           branch: '{branch}'
-          files: '**/{project-name}/**'
+          files: '*/{project-name}/**'
 
     builders:
       - lf-update-java-alternatives:
@@ -105,7 +105,7 @@
           server: '{server-name}'
           project: 'integration/csit'
           branch: '{branch}'
-          files: '**/{project-name}/**'
+          files: '*/{project-name}/**'
       - timed: '@daily'
       - reverse:
           jobs: '{obj:trigger_jobs}'
@@ -129,67 +129,6 @@
           notify-every-unstable-build: false
           send-to-individuals: true
 
-- job-template:
-    # 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'
-    node: '{build-node}'
-    recipients: ''
-    java-version: 'openjdk11'
-    python-version: python3
-
-    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}'
-      - integration-test-options:
-          test-options: '{robot-options}'
-
-    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-update-java-alternatives:
-          java-version: '{java-version}'
-      - integration-install-robotframework
-      - inject:
-          properties-file: 'env.properties'
-      - integration-run-project-test
-
-    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
-
 - verification_maven_job_boiler_plate: &verification_maven_job_boiler_plate
     name: verification_maven_job_boiler_plate
 
@@ -198,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
@@ -232,7 +172,7 @@
     #####################
     # Job Configuration #
     #####################
-
+    concurrent: "{build-concurrent}"
     properties:
       - lf-infra-properties:
           project: '{project}'
@@ -288,7 +228,14 @@
       - 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