Merge "Allow vars in verify job"

diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 153562b..f356e4e 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -3,7 +3,8 @@
     name: dcaegen2-services-sdk
     project-name: 'dcaegen2-services-sdk'
     jobs:
-      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-verify-java':
+          build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true"
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           build-node: ubuntu1604-docker-8c-8g

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index b919c1f..881b045 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -13,11 +13,11 @@
     project-type: freestyle
     concurrent: true
     node: '{build-node}'
+    build-env-variables: ''
     pattern: '**'
     pom:
     mvn-opts: ''
     java-opts: ''
-
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -55,6 +55,8 @@
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
+      - inject:
+          properties-content: "{build-env-variables}"
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{obj:pom}'