From ead96c907805fd3082770b4c1753d99bb1aa5c17 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Wed, 21 Nov 2018 17:12:20 +0000
Subject: [PATCH] move scripts to util repo

---
 Jenkinsfile | 13 +++++++------
 build.ps1   |  6 ------
 destroy.ps1 | 16 ----------------
 rebuild.ps1 |  5 -----
 4 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 build.ps1
 delete mode 100644 destroy.ps1
 delete mode 100644 rebuild.ps1

diff --git a/Jenkinsfile b/Jenkinsfile
index 4829857..7bd9066 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,16 +19,17 @@ node('windows') {
 
     checkout scm
 
-/*  stage 'Acquire util files'
+  stage 'Acquire util files'
 
-    sh 'mkdir -p tmp && mkdir -p bin'
+	powershell(returnStatus: true, script: 'New-Item -ItemType directory -Path ./tmp')
+	powershell(returnStatus: true, script: 'New-Item -ItemType directory -Path ./bin')
     dir('tmp'){
       git([ url: "https://github.internet2.edu/docker/util.git",
           credentialsId: "jenkins-github-access-token" ])
-      sh 'mv ./bin/* ../bin/.'
+	  powershell(returnStatus: true, script: 'Move-Item -Path ./bin/* -Destination ../bin/.')
     }
-    sh 'rm -rf tmp'
-*/
+    powershell(returnStatus: true, script: 'Remove-Item ./tmp -Force -Recurse')
+
 
   stage 'Setting build context'
   
@@ -53,7 +54,7 @@ node('windows') {
      
   stage 'Build'
 
-      def status = powershell(returnStatus: true, script: './rebuild.ps1 > ./debug')
+      def status = powershell(returnStatus: true, script: 'bin/windows/rebuild.ps1 > ./debug')
       if (status == 0) {
 	    echo "build success"
 	  } else {
diff --git a/build.ps1 b/build.ps1
deleted file mode 100644
index a78b25d..0000000
--- a/build.ps1
+++ /dev/null
@@ -1,6 +0,0 @@
-$maintainer = "tier"
-$imagename = "shib-idp-windows"
-$fullimagename = $($maintainer) + '/' + $($imagename)
-
-echo "Building new Docker image $maintainer/$imagename"
-docker build --rm -t $maintainer/$imagename .
diff --git a/destroy.ps1 b/destroy.ps1
deleted file mode 100644
index 559de87..0000000
--- a/destroy.ps1
+++ /dev/null
@@ -1,16 +0,0 @@
-$maintainer = "tier"
-$imagename = "shib-idp-windows"
-$fullimagename = $($maintainer) + '/' + $($imagename)
-
-$result = docker ps -a | grep $($fullimagename) | awk '{print $1}'
-
-if ( $result ) {
-  docker rm -f $(docker ps -a | grep $($fullimagename) | awk '{print $1}')
-  docker rmi -f $($fullimagename)
-  echo "container/image removed..."
-} else {
-  echo "no container/image found..."
-}
-
-
-  
diff --git a/rebuild.ps1 b/rebuild.ps1
deleted file mode 100644
index dbbb3c2..0000000
--- a/rebuild.ps1
+++ /dev/null
@@ -1,5 +0,0 @@
-. ./destroy.ps1
-if ($lastexitcode -ne 0) { exit $lastexitcode} 
-. ./build.ps1
-if ($lastexitcode -ne 0) { exit $lastexitcode} 
-