bug/delete components job broken (#768)

* add 20mi min storage * fix bug in deleteprojects * add better titles, and also fix bug in delete components
opendevstack · Aug 11, 2020 · c4a121a · c4a121a
1 parent f0fd896
commit c4a121a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/create-projects/Jenkinsfile b/create-projects/Jenkinsfile
@@ -49,7 +49,7 @@ podTemplate(
   serviceAccount: 'jenkins'
 ) {
   node(podLabel) {
-
+    currentBuild.description = "ODS Build #${env.BUILD_NUMBER} creating project: ${projectId}"
     stage('Checkout ods-core') {
       sh 'mkdir -p ods-core'
       dir('ods-core') {

diff --git a/delete-components/Jenkinsfile b/delete-components/Jenkinsfile
@@ -28,9 +28,10 @@ podTemplate(
 ) {
   node(podLabel) {
     stage('delete components') {
-      sh "oc delete all -n ${project_id}-dev -l app=${project_id}-${component_id}"
-      sh "oc delete all -n ${project_id}-test -l app=${project_id}-${component_id}"
-      sh "oc delete all -n ${project_id}-cd -l app=${project_id}-${component_id}"
+      currentBuild.description = "ODS Build #${env.BUILD_NUMBER} delete component '${componentId}' in project: ${projectId}"
+      sh "oc delete all -n ${projectId}-dev -l app=${projectId}-${componentId}"
+      sh "oc delete all -n ${projectId}-test -l app=${projectId}-${componentId}"
+      sh "oc delete all -n ${projectId}-cd -l app=${projectId}-${componentId}"
     }
   }
 }
diff --git a/delete-projects/Jenkinsfile b/delete-projects/Jenkinsfile
@@ -30,6 +30,7 @@ podTemplate(
       if (!projectId) {
         error ("No project ID passed - aborting")
       }
+      currentBuild.description = "ODS Build #${env.BUILD_NUMBER} delete project: ${projectId}"
       def exists = sh(
           script: "oc project ${projectId}-cd &> /dev/null",
           label: "Check if OpenShift project '${projectId}-cd' exists",