diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-02 23:11:36 +0200 |
|---|---|---|
| committer |   Aric Gardner <agardner@linuxfoundation.org> | 2017-09-08 19:02:12 +0000 |
| commit | 510e38e4a832afb96885f9d21156ef095519cd23 (patch) | |
| tree | 34e43f60882341cd29a9da87f9a662b16e9e86a1 /jjb/apex | |
| parent | 3d34691287f0efd7361cc35f9a7cbe4e27f0b5f6 (diff) | |
installers: Use global macro 'clean-workspace'
Change-Id: I34a555697d963efc38064a7b53f25191d6bf1382
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'jjb/apex')
| -rwxr-xr-x | jjb/apex/apex-workspace-cleanup.sh | 7 | ||||
| -rw-r--r-- | jjb/apex/apex.yml | 9 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 9 |
3 files changed, 2 insertions, 23 deletions
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 @@ -1706,13 +1706,6 @@ !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: - shell: 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 @@ -1133,13 +1133,6 @@ !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: - shell: |