X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy4nfv-merge-jobs.yml;h=97d830f9fa05dd6bca0d301a4e7f632b57de90e5;hb=510e38e4a832afb96885f9d21156ef095519cd23;hp=f7a6c13636d8a66697ff9af42939aca17df1f4ee;hpb=3d34691287f0efd7361cc35f9a7cbe4e27f0b5f6;p=releng.git diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml index f7a6c1363..97d830f9f 100644 --- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml @@ -192,8 +192,7 @@ !include-raw: ./daisy4nfv-build.sh - shell: !include-raw: ./daisy4nfv-upload-artifact.sh - - shell: - !include-raw: ./daisy4nfv-workspace-cleanup.sh + - 'clean-workspace' - builder: name: 'daisy-merge-deploy-virtual-macro' @@ -202,8 +201,7 @@ !include-raw: ./daisy4nfv-download-artifact.sh - shell: !include-raw: ./daisy-deploy.sh - - shell: - !include-raw: ./daisy4nfv-workspace-cleanup.sh + - 'clean-workspace' ##################################### # parameter macros