From 7e507875f63896df2bfd2e3efe33da2a9521f6ad Mon Sep 17 00:00:00 2001 From: "robert.tomczyk" Date: Tue, 18 Jun 2019 17:20:26 +0100 Subject: [PATCH] OPENDEV: Add additional parameters to SCM module The projects should have control about their workspace. Following parmaters are introduced for git-scm and git-scm-gerrit to control what should be done with git repository when the jenkins job is executed: - wipe_workspace: Wipe out repository and force clone (default: true) - clean_before: Clean up the workspace before every checkout by deleting all untracked files and directories (default: false) Change-Id: I6216334251d9af8c0c6b9818b2ef3280d6196ef5 --- jjb/acumos/global-templates-acumos-java.yaml | 2 ++ jjb/acumos/global-templates-acumos-push-upstream.yaml | 2 ++ jjb/acumos/global-templates-acumos-rebase.yaml | 2 ++ jjb/cloud-infra/cloud-infra-periodic-engine.yaml | 4 ++++ jjb/cloud-infra/cloud-infra-periodic-scenario.yaml | 4 ++++ jjb/cloud-infra/cloud-infra-verify-engine.yaml | 4 ++++ jjb/cloud-infra/cloud-infra-verify-scenario.yaml | 4 ++++ jjb/cloud-infra/cloud-infra-verify-testfw.yaml | 4 ++++ jjb/global/global-templates-java.yaml | 2 ++ jjb/global/global-templates-push-upstream.yaml | 2 ++ jjb/global/global-templates-rebase.yaml | 2 ++ jjb/global/jjb-macros.yaml | 10 ++++++++-- jjb/infra/jjb-merge-jobs.yaml | 2 ++ jjb/infra/jjb-verify-jobs.yaml | 2 ++ jjb/onap/global-templates-onap-java.yaml | 2 ++ jjb/onap/global-templates-onap-push-upstream.yaml | 2 ++ jjb/onap/global-templates-onap-rebase.yaml | 2 ++ .../global-templates-opendaylight-push-upstream.yaml | 2 ++ .../global-templates-opendaylight-rebase.yaml | 2 ++ .../global-templates-opendev-push-upstream-test.yaml | 2 ++ .../global-templates-opendev-push-upstream.yaml | 2 ++ jjb/opendev/global-templates-opendev-rebase-test.yaml | 2 ++ jjb/opendev/global-templates-opendev-rebase.yaml | 2 ++ 23 files changed, 62 insertions(+), 2 deletions(-) diff --git a/jjb/acumos/global-templates-acumos-java.yaml b/jjb/acumos/global-templates-acumos-java.yaml index 80344fda9..707f39836 100644 --- a/jjb/acumos/global-templates-acumos-java.yaml +++ b/jjb/acumos/global-templates-acumos-java.yaml @@ -37,6 +37,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false triggers: - nordix-gerrit-trigger-patchset-created: diff --git a/jjb/acumos/global-templates-acumos-push-upstream.yaml b/jjb/acumos/global-templates-acumos-push-upstream.yaml index a6b6ccad0..2a31aafda 100644 --- a/jjb/acumos/global-templates-acumos-push-upstream.yaml +++ b/jjb/acumos/global-templates-acumos-push-upstream.yaml @@ -21,6 +21,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false triggers: - nordix-gerrit-push-upstream: diff --git a/jjb/acumos/global-templates-acumos-rebase.yaml b/jjb/acumos/global-templates-acumos-rebase.yaml index e26e872ea..994c9236d 100644 --- a/jjb/acumos/global-templates-acumos-rebase.yaml +++ b/jjb/acumos/global-templates-acumos-rebase.yaml @@ -25,6 +25,8 @@ ssh-credentials-id: nordixinfra-lfn-gerrit-ssh branch: '{branch}' refspec: '' + wipe_workspace: true + clean_before: false triggers: - acumos-gerrit-trigger-change-merged: diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml index 4e0ced529..c912c05d3 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml @@ -149,6 +149,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: '' + wipe_workspace: true + clean_before: false triggers: - timed: '{build-trigger}' @@ -274,6 +276,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: '' + wipe_workspace: true + clean_before: false builders: - 'cloud-infra-{phase}-macro' diff --git a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml index 1aa585653..c1e43456a 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml @@ -158,6 +158,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: '' + wipe_workspace: true + clean_before: false triggers: - timed: '@daily' @@ -302,6 +304,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: '' + wipe_workspace: true + clean_before: false builders: - description-setter: diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml index 84908e645..18f106bb8 100644 --- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml +++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml @@ -145,6 +145,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false triggers: - gerrit: @@ -274,6 +276,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false builders: - 'cloud-infra-determine-scenario-macro' diff --git a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml index 37141c9cc..502d40c06 100644 --- a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml +++ b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml @@ -141,6 +141,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false triggers: - nordix-gerrit-trigger-patchset-created: @@ -252,6 +254,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false builders: - 'cloud-infra-determine-scenario-macro' diff --git a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml index e169b69ca..110705c08 100644 --- a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml +++ b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml @@ -132,6 +132,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false triggers: - nordix-gerrit-trigger-patchset-created: @@ -238,6 +240,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false builders: - 'cloud-infra-testfw-macro' diff --git a/jjb/global/global-templates-java.yaml b/jjb/global/global-templates-java.yaml index 53eab0512..b3d651e56 100644 --- a/jjb/global/global-templates-java.yaml +++ b/jjb/global/global-templates-java.yaml @@ -37,6 +37,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false triggers: - nordix-gerrit-trigger-patchset-created: diff --git a/jjb/global/global-templates-push-upstream.yaml b/jjb/global/global-templates-push-upstream.yaml index 032a71748..b3c0b483a 100644 --- a/jjb/global/global-templates-push-upstream.yaml +++ b/jjb/global/global-templates-push-upstream.yaml @@ -21,6 +21,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false triggers: - nordix-gerrit-push-upstream: diff --git a/jjb/global/global-templates-rebase.yaml b/jjb/global/global-templates-rebase.yaml index 6ac53a954..58579421b 100644 --- a/jjb/global/global-templates-rebase.yaml +++ b/jjb/global/global-templates-rebase.yaml @@ -25,6 +25,8 @@ ssh-credentials-id: nordixinfra-lfn-gerrit-ssh branch: '{branch}' refspec: '' + wipe_workspace: true + clean_before: false triggers: - onap-gerrit-trigger-change-merged: diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml index 834b60fd1..b9040e4a4 100644 --- a/jjb/global/jjb-macros.yaml +++ b/jjb/global/jjb-macros.yaml @@ -132,8 +132,11 @@ shallow-clone: false use-author: false ignore-notify: false - wipe-workspace: true + wipe-workspace: '{wipe_workspace}' prune: false + clean: + after: false + before: '{clean_before}' choosing-strategy: 'default' - scm: @@ -151,8 +154,11 @@ shallow-clone: false use-author: false ignore-notify: false - wipe-workspace: true + wipe-workspace: '{wipe_workspace}' prune: false + clean: + after: false + before: '{clean_before}' choosing-strategy: 'gerrit' # triggers for Nordix Gerrit diff --git a/jjb/infra/jjb-merge-jobs.yaml b/jjb/infra/jjb-merge-jobs.yaml index ccbaf6b2d..569be7b7b 100644 --- a/jjb/infra/jjb-merge-jobs.yaml +++ b/jjb/infra/jjb-merge-jobs.yaml @@ -37,6 +37,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: '' + wipe_workspace: true + clean_before: false triggers: - nordix-gerrit-trigger-change-merged: diff --git a/jjb/infra/jjb-verify-jobs.yaml b/jjb/infra/jjb-verify-jobs.yaml index 28eca1526..043578b6b 100644 --- a/jjb/infra/jjb-verify-jobs.yaml +++ b/jjb/infra/jjb-verify-jobs.yaml @@ -37,6 +37,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false triggers: - nordix-gerrit-trigger-patchset-created: diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml index 5f79175d3..0b522b582 100644 --- a/jjb/onap/global-templates-onap-java.yaml +++ b/jjb/onap/global-templates-onap-java.yaml @@ -37,6 +37,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false triggers: - nordix-gerrit-trigger-patchset-created: diff --git a/jjb/onap/global-templates-onap-push-upstream.yaml b/jjb/onap/global-templates-onap-push-upstream.yaml index 5e44ed858..339da3798 100644 --- a/jjb/onap/global-templates-onap-push-upstream.yaml +++ b/jjb/onap/global-templates-onap-push-upstream.yaml @@ -21,6 +21,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false triggers: - nordix-gerrit-push-upstream: diff --git a/jjb/onap/global-templates-onap-rebase.yaml b/jjb/onap/global-templates-onap-rebase.yaml index 74da77b7a..6c297acbe 100644 --- a/jjb/onap/global-templates-onap-rebase.yaml +++ b/jjb/onap/global-templates-onap-rebase.yaml @@ -25,6 +25,8 @@ ssh-credentials-id: nordixinfra-lfn-gerrit-ssh branch: '{branch}' refspec: '' + wipe_workspace: true + clean_before: false triggers: - onap-gerrit-trigger-change-merged: diff --git a/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml b/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml index 8a6fd2119..d1e6b500f 100644 --- a/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml +++ b/jjb/opendaylight/global-templates-opendaylight-push-upstream.yaml @@ -21,6 +21,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false triggers: - nordix-gerrit-push-upstream: diff --git a/jjb/opendaylight/global-templates-opendaylight-rebase.yaml b/jjb/opendaylight/global-templates-opendaylight-rebase.yaml index b9ee8f0e0..0f1c5c7cf 100644 --- a/jjb/opendaylight/global-templates-opendaylight-rebase.yaml +++ b/jjb/opendaylight/global-templates-opendaylight-rebase.yaml @@ -25,6 +25,8 @@ ssh-credentials-id: nordixinfra-lfn-gerrit-ssh branch: '{branch}' refspec: '' + wipe_workspace: true + clean_before: false triggers: - odl-gerrit-trigger-change-merged: diff --git a/jjb/opendev/global-templates-opendev-push-upstream-test.yaml b/jjb/opendev/global-templates-opendev-push-upstream-test.yaml index e9d545ef1..5b8bfb612 100644 --- a/jjb/opendev/global-templates-opendev-push-upstream-test.yaml +++ b/jjb/opendev/global-templates-opendev-push-upstream-test.yaml @@ -22,6 +22,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: $GERRIT_BRANCH refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false triggers: - nordix-gerrit-patchset-created-or-push-upstream: diff --git a/jjb/opendev/global-templates-opendev-push-upstream.yaml b/jjb/opendev/global-templates-opendev-push-upstream.yaml index addf5f41d..072000204 100644 --- a/jjb/opendev/global-templates-opendev-push-upstream.yaml +++ b/jjb/opendev/global-templates-opendev-push-upstream.yaml @@ -21,6 +21,8 @@ ssh-credentials-id: nordixinfra-nordix-gerrit-ssh branch: '{branch}' refspec: $GERRIT_REFSPEC + wipe_workspace: true + clean_before: false triggers: - nordix-gerrit-patchset-created-or-push-upstream: diff --git a/jjb/opendev/global-templates-opendev-rebase-test.yaml b/jjb/opendev/global-templates-opendev-rebase-test.yaml index b96f0b070..b915c8b1b 100644 --- a/jjb/opendev/global-templates-opendev-rebase-test.yaml +++ b/jjb/opendev/global-templates-opendev-rebase-test.yaml @@ -26,6 +26,8 @@ ssh-credentials-id: nordixinfra-lfn-gerrit-ssh branch: 'master' refspec: '' + wipe_workspace: false + clean_before: true triggers: - opendev-gerrit-trigger-change-merged: diff --git a/jjb/opendev/global-templates-opendev-rebase.yaml b/jjb/opendev/global-templates-opendev-rebase.yaml index c376ed40c..fc5d39150 100644 --- a/jjb/opendev/global-templates-opendev-rebase.yaml +++ b/jjb/opendev/global-templates-opendev-rebase.yaml @@ -25,6 +25,8 @@ ssh-credentials-id: nordixinfra-lfn-gerrit-ssh branch: '{branch}' refspec: '' + wipe_workspace: true + clean_before: false triggers: - opendev-gerrit-trigger-change-merged: -- 2.25.1