From 993e5364e191aa91cde66db35b4f6116be9cad6c Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Fri, 30 Aug 2019 14:40:34 -0700 Subject: [PATCH] Allow vars in verify job Allow verify-java inject additional env variables. Allow TESTCONTAINERS_RYUK_DISABLED=true in dcaegen2 verify job. Change-Id: I9dc9dffd084e1f7a43dbe6521fb698aa9b242219 Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall --- jjb/dcaegen2/dcaegen2-services-sdk.yaml | 3 ++- jjb/global-templates-java.yaml | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index 153562b82..f356e4eb4 100644 --- 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 b919c1f2a..881b045e8 100644 --- 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}' -- 2.16.6