From 510e38e4a832afb96885f9d21156ef095519cd23 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 2 Sep 2017 23:11:36 +0200 Subject: installers: Use global macro 'clean-workspace' Change-Id: I34a555697d963efc38064a7b53f25191d6bf1382 Signed-off-by: Alexandru Avadanii --- jjb/apex/apex-workspace-cleanup.sh | 7 ------- jjb/apex/apex.yml | 9 +-------- jjb/apex/apex.yml.j2 | 9 +-------- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100755 jjb/apex/apex-workspace-cleanup.sh (limited to 'jjb/apex') diff --git a/jjb/apex/apex-workspace-cleanup.sh b/jjb/apex/apex-workspace-cleanup.sh deleted file mode 100755 index d2f71a562..000000000 --- a/jjb/apex/apex-workspace-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -o errexit -set -o nounset -set -o pipefail - -# delete everything that is in $WORKSPACE -sudo /bin/rm -rf $WORKSPACE diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index b794181e3..c71bee1d0 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -602,7 +602,7 @@ description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO" - 'apex-download-artifact' - 'apex-deploy' - - 'apex-workspace-cleanup' + - 'clean-workspace' # Baremetal Deploy and Test @@ -1705,13 +1705,6 @@ - shell: !include-raw: ./apex-unit-test.sh -- builder: - name: 'apex-workspace-cleanup' - builders: - - shell: - !include-raw: ./apex-workspace-cleanup.sh - - - builder: name: 'apex-upload-artifact' builders: diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 4e6452746..356c718d5 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -514,7 +514,7 @@ description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO" - 'apex-download-artifact' - 'apex-deploy' - - 'apex-workspace-cleanup' + - 'clean-workspace' # Baremetal Deploy and Test @@ -1132,13 +1132,6 @@ - shell: !include-raw: ./apex-unit-test.sh -- builder: - name: 'apex-workspace-cleanup' - builders: - - shell: - !include-raw: ./apex-workspace-cleanup.sh - - - builder: name: 'apex-upload-artifact' builders: -- cgit 1.2.3-korg