From 510e38e4a832afb96885f9d21156ef095519cd23 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sat, 2 Sep 2017 23:11:36 +0200
Subject: installers: Use global macro 'clean-workspace'
Change-Id: I34a555697d963efc38064a7b53f25191d6bf1382
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
jjb/daisy4nfv/daisy-project-jobs.yml | 3 +--
jjb/daisy4nfv/daisy4nfv-merge-jobs.yml | 6 ++----
jjb/daisy4nfv/daisy4nfv-verify-jobs.yml | 3 +--
jjb/daisy4nfv/daisy4nfv-workspace-cleanup.sh | 16 ----------------
4 files changed, 4 insertions(+), 24 deletions(-)
delete mode 100755 jjb/daisy4nfv/daisy4nfv-workspace-cleanup.sh
(limited to 'jjb/daisy4nfv')
diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index 09b0bc2e1..bcb89105e 100644
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -185,8 +185,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-deploy-daily-macro'
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
diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index 6f6ab0fb0..1828ce459 100644
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
@@ -183,8 +183,7 @@
!include-raw: ./daisy4nfv-basic.sh
- shell:
!include-raw: ./daisy4nfv-build.sh
- - shell:
- !include-raw: ./daisy4nfv-workspace-cleanup.sh
+ - 'clean-workspace'
- builder:
name: daisy-verify-unit-macro
diff --git a/jjb/daisy4nfv/daisy4nfv-workspace-cleanup.sh b/jjb/daisy4nfv/daisy4nfv-workspace-cleanup.sh
deleted file mode 100755
index 26f7e9a01..000000000
--- a/jjb/daisy4nfv/daisy4nfv-workspace-cleanup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2016 ZTE Coreporation and others.
-# hu.zhijiang@zte.com.cn
-# sun.jing22@zte.com.cn
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-set -o errexit
-set -o nounset
-set -o pipefail
-
-# delete the $WORKSPACE to open some space
-/bin/rm -rf $WORKSPACE
--
cgit