Adjust for jenkins pipeline for more specific appliance cleanupt and …

…setup.
docker · Sep 2, 2016 · aa21c19af82831726ff137bbae46865910fb305c · aa21c19
1 parent 2357013
commit aa21c19af82831726ff137bbae46865910fb305c
Unified Split

Showing with 6 additions and 6 deletions.

+4 −4 Jenkinsfile

+1 −1 comanage-appliance.json

+1 −1 shibboleth-appliance.json
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -11,8 +11,8 @@ if (BRANCH_TEST=="shibboleth-production"){
 
     try {
       stage 'Cleanup & Setup'
-        sh 'rm -rf output-*'
-        sh 'rm -rf "/Users/levvel/VirtualBox VMs/"'
+        sh 'rm -rf output-shibboleth-*'
+        sh 'rm -rf "/Users/levvel/VirtualBox VMs/shibboleth-appliance-*"'
         sh 'rm -rf builds'
         sh 'mkdir -p builds'
 
@@ -58,8 +58,8 @@ if (BRANCH_TEST=="shibboleth-production"){
 
     try {
       stage 'Cleanup & Setup '
-        sh 'rm -rf output-*'
-        sh 'rm -rf "/Users/levvel/VirtualBox VMs"'
+        sh 'rm -rf output-comanage-*'
+        sh 'rm -rf "/Users/levvel/VirtualBox VMs/comange-appliance-*"'
         sh 'rm  -rf builds'
         sh 'mkdir -p builds'
 

diff --git a/comanage-appliance.json b/comanage-appliance.json
@@ -53,7 +53,7 @@
         "ssh_wait_timeout": "10000s",
         "guest_additions_mode": "disable",
         "shutdown_command": "sudo -S shutdown -P now",
-        "output_directory": "output-{{user `profile`}}",
+        "output_directory": "output-comanage-{{user `profile`}}",
         "format": "ova"
     }
   ],

diff --git a/shibboleth-appliance.json b/shibboleth-appliance.json
@@ -53,7 +53,7 @@
         "ssh_wait_timeout": "10000s",
         "guest_additions_mode": "disable",
         "shutdown_command": "sudo -S shutdown -P now",
-        "output_directory": "output-{{user `profile`}}",
+        "output_directory": "output-shibboleth-{{user `profile`}}",
         "format": "ova"
     }
   ],