diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-01-31 05:16:56 -0800 |
|---|---|---|
| committer | Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-01-31 05:16:56 -0800 |
| commit | 94ef33d26aebc900841021aa54b0468c7e14c286 (patch) | |
| tree | b383fb669cabe929d9dd20e96aae2f489dc322bf | |
| parent | 83f7ebfa46e6484274be9d26e29cb7d7e73ba921 (diff) | |
Clean-up base java and python job templates
Change-Id: I03205b412a32adf7daa0294b6624037fedf9c3c9
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
| -rw-r--r-- | jjb/global-templates-java.yaml | 50 | ||||
| -rw-r--r-- | jjb/global-templates-python.yaml | 11 |
2 files changed, 30 insertions, 31 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 7e1657433..ffe61dcb6 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -15,11 +15,8 @@ node: '{build-node}' properties: - - build-discarder: - days-to-keep: '{build-days-to-keep}' - num-to-keep: '{build-num-to-keep}' - artifact-days-to-keep: '{build-artifact-days-to-keep}' - artifact-num-to-keep: '{build-artifact-num-to-keep}' + - ecomp-infra-properties: + build-days-to-keep: '{build-days-to-keep}' parameters: - ecomp-infra-parameters: @@ -38,8 +35,10 @@ triggers: - gerrit-trigger-patch-submitted: - name: '{project}' + server: '{server-name}' + project: '{project}' branch: '{branch}' + files: '**' builders: - provide-maven-settings: @@ -76,11 +75,8 @@ node: '{build-node}' properties: - - build-discarder: - days-to-keep: '{build-days-to-keep}' - num-to-keep: '{build-num-to-keep}' - artifact-days-to-keep: '{build-artifact-days-to-keep}' - artifact-num-to-keep: '{build-artifact-num-to-keep}' + - ecomp-infra-properties: + build-days-to-keep: '{build-days-to-keep}' parameters: - ecomp-infra-parameters: @@ -98,10 +94,11 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-submitted-pattern: - name: '{project}' + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: '{project}' branch: '{branch}' - pattern: '{pattern}' + files: '{pattern}' builders: - provide-maven-settings: @@ -134,11 +131,8 @@ node: '{build-node}' properties: - - build-discarder: - days-to-keep: '{build-days-to-keep}' - num-to-keep: '{build-num-to-keep}' - artifact-days-to-keep: '{build-artifact-days-to-keep}' - artifact-num-to-keep: '{build-artifact-num-to-keep}' + - ecomp-infra-properties: + build-days-to-keep: '{build-days-to-keep}' parameters: - ecomp-infra-parameters: @@ -157,8 +151,10 @@ triggers: - gerrit-trigger-patch-merged: - name: '{project}' + server: '{server-name}' + project: '{project}' branch: '{branch}' + files: '**' builders: - provide-maven-settings: @@ -196,11 +192,8 @@ node: '{build-node}' properties: - - build-discarder: - days-to-keep: '{build-days-to-keep}' - num-to-keep: '{build-num-to-keep}' - artifact-days-to-keep: '{build-artifact-days-to-keep}' - artifact-num-to-keep: '{build-artifact-num-to-keep}' + - ecomp-infra-properties: + build-days-to-keep: '{build-days-to-keep}' parameters: - ecomp-infra-parameters: @@ -218,10 +211,11 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-merged-pattern: - name: '{project}' + - gerrit-trigger-patch-merged: + server: '{server-name}' + project: '{project}' branch: '{branch}' - pattern: '{pattern}' + files: '{pattern}' builders: - provide-maven-settings: diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index 304d60aea..e1e8b4587 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -20,6 +20,10 @@ concurrent: true node: '{build-node}' + properties: + - ecomp-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + parameters: - ecomp-infra-parameters: project: '{project}' @@ -36,10 +40,11 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-submitted-pattern: - name: '{project}' + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: '{project}' branch: '{branch}' - pattern: '{pattern}' + files: '{pattern}' builders: - shell: | |