From 0911acd3b87fbae080749d61e02d4157204f6eb1 Mon Sep 17 00:00:00 2001
From: Andrew Pitt <apitt@redhat.com>
Date: Fri, 20 Dec 2019 16:14:52 -0500
Subject: [PATCH] Update and rename OldJenkinsfile to Jenkinsfile

---
 OldJenkinsfile => Jenkinsfile | 24 ------------------------
 1 file changed, 24 deletions(-)
 rename OldJenkinsfile => Jenkinsfile (71%)

diff --git a/OldJenkinsfile b/Jenkinsfile
similarity index 71%
rename from OldJenkinsfile
rename to Jenkinsfile
index d723057fa..c5ea085bb 100644
--- a/OldJenkinsfile
+++ b/Jenkinsfile
@@ -41,22 +41,6 @@ try {
                 }
             }
         }
-    }
-    node('jenkins-slave-skopeo') {
-        
-        stage('Clair Container Vulnerability Scan') {
-            sh "oc login -u $ocpUser -p $ocpPassword --insecure-skip-tls-verify https://api.cluster-ottawa-57ac.ottawa-57ac.example.opentlc.com:6443 2>&1"
-            sh 'skopeo --debug copy --src-creds="$(oc whoami)":"$(oc whoami -t)" --src-tls-verify=false --dest-tls-verify=false' + " --dest-creds=$quayUser:$quayPassword docker://docker-registry.default.svc:5000/cicd/spring-petclinic:latest docker://quay.io/$quayUser/spring-petclinic:latest"
-        }
-        
-        stage("Tag DEV") {
-            echo "Tag image to DEV"
-            openshift.withCluster() {
-                openshift.withProject('cicd') {
-                    openshift.tag("${appName}:latest", "${appName}:dev")
-                }
-            }
-        }
         stage("Deploy DEV") {
             echo "Deploy to DEV."
             openshift.withCluster() {
@@ -68,14 +52,6 @@ try {
                 }
             }
         }
-        stage("Tag for QA") {
-            echo "Tag to UAT"
-            openshift.withCluster() {
-                openshift.withProject('cicd') {
-                    openshift.tag("${appName}:dev", "${appName}:uat")
-                }
-            }
-        }
         stage("Deploy UAT") {
             echo "Deploy to UAT."
             openshift.withCluster() {