diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2019-09-03 19:04:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-09-03 19:04:16 +0000 |
| commit | b5658110a5ad6e9dcef56cb7871a20b3879c7f1b (patch) | |
| tree | c547be61b351e189da745d26901181252c2ee78a | |
| parent | 72a59c306dc077fdf1ea6d305be602247d8b8570 (diff) | |
| parent | 993e5364e191aa91cde66db35b4f6116be9cad6c (diff) | |
Merge "Allow vars in verify job"
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-sdk.yaml | 3 | ||||
| -rw-r--r-- | 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}' |