From fe096ee681d07a4fe96a941c97bb233b4148487f Mon Sep 17 00:00:00 2001
From: Tim McCarthy <tim.mccarthy@perficient.com>
Date: Thu, 27 Feb 2020 00:21:00 -0800
Subject: [PATCH] Added other tasks back in

---
 deploy/aro/catalog-api/azure-pipelines.yml | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/deploy/aro/catalog-api/azure-pipelines.yml b/deploy/aro/catalog-api/azure-pipelines.yml
index 8ce560bba..d5328f6dc 100644
--- a/deploy/aro/catalog-api/azure-pipelines.yml
+++ b/deploy/aro/catalog-api/azure-pipelines.yml
@@ -34,9 +34,21 @@ stages:
           inputs:
             sourcePath: ./deploy/aro/catalog-api
             filePattern: catalog-public-route.json
-        - task: CopyFiles@2
+        - task: redhat.openshift-vsts.oc-setup-task.oc-setup@2
+          displayName: 'Setup Openshift CLI'
           inputs:
-            contents: deploy/aro/catalog-api/catalog-public-route.json
-            targetFolder: $(Build.ArtifactStagingDirectory)
-        - task: PublishBuildArtifacts@1
-          displayName: 'Publish Artifact: drop'
\ No newline at end of file
+            openshiftService: $(OpenShiftServiceConnection)
+        - script: 'oc project $(OpenShiftProject)'
+          failOnStderr: true
+          displayName: 'Set OpenShift Project Context'
+        - script: 'oc process -f ./deploy/aro/openshift-templates/catalogapi-deploy-template.yml 
+            -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) 
+            -p PIC_BASE_URL=$(PicBaseUrl) 
+            -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) 
+            -p CATALOG_PUBLIC_HOSTNAME=$(CatalogPublicHostName) 
+            | oc apply -f-'
+          failOnStderr: true
+          displayName: 'Ensure Catalog API OpenShift DeploymentConfig and Service'
+        - script: 'oc apply -f ./deploy/aro/catalog-api/catalog-public-route.json'
+          failOnStderr: true
+          displayName: 'Ensure Catalog API Route'
\ No newline at end of file