Revert "Adding INT e2e pipeline (#227)"

This reverts commit 308d6b6b5e.

.pipelines/pr-e2e.yml

@@ -23,36 +23,19 @@ jobs:
       - script: |
           export SECRET_SA_ACCOUNT_NAME=$(SECRET_SA_ACCOUNT_NAME)
           make secrets
-          . secrets/env
-          echo "##vso[task.setvariable variable=RP_MODE]$RP_MODE"
         displayName: "🔑 Downloading certificates and secrets from storage account"
-        name: setEnv
         workingDirectory: "${{ variables.modulePath }}"
       - script: |
-          . secrets/env
           make aro
         displayName: "⚙️ Building ARO RP Golang binary"
         workingDirectory: "${{ variables.modulePath }}"
-        condition: eq(variables['RP_MODE'], 'development')
-      - template: ./templates/template-az-cli-set-context.yml
-        parameters:
-          workingDirectory: ${{ variables.modulePath }}
       - template: ./templates/template-deploy-e2e-deps.yml
         parameters:
           workingDirectory: ${{ variables.modulePath }}
       - template: ./templates/template-deploy-e2e-db.yml
         parameters:
           workingDirectory: ${{ variables.modulePath }}
-      - template: ./templates/template-run-rp.yml
-        parameters:
-          workingDirectory: ${{ variables.modulePath }}
-      - template: ./templates/template-run-e2e.yml
-        parameters:
-          workingDirectory: ${{ variables.modulePath }}
-      - template: ./templates/template-kill-rp.yml
-        parameters:
-          workingDirectory: ${{ variables.modulePath }}
-      - template: ./templates/template-clean-e2e-db.yml
+      - template: ./templates/template-run-rp-and-e2e.yml
         parameters:
           workingDirectory: ${{ variables.modulePath }}
       - template: ./templates/template-clean-e2e-deps.yml

.pipelines/templates/template-az-cli-set-context.yml

@@ -1,12 +0,0 @@
-parameters:
-  workingDirectory: ""
-  azureDevOpsJSONSPN: ""
-steps:
-  - script: |
-      cd ${{ parameters.workingDirectory }}
-
-      . secrets/env
-      . ./hack/e2e/run-rp-and-e2e.sh
-
-      set_cli_context
-    displayName: "⚙️ AZ Context Setup"

.pipelines/templates/template-clean-e2e-db.yml

@@ -1,13 +0,0 @@
-parameters:
-  workingDirectory: ""
-steps:
-  - script: |
-      cd ${{ parameters.workingDirectory }}
-
-      . secrets/env
-      . ./hack/e2e/run-rp-and-e2e.sh
-
-      export DATABASE_NAME=v4-e2e-$(git log --format=%h -n 1 HEAD)
-      clean_e2e_db
-    displayName: "🧹 Clean cluster DB"
-    condition: and(always(), eq(variables['RP_MODE'], 'development'))

.pipelines/templates/template-clean-e2e-deps.yml

@@ -9,6 +9,7 @@ steps:
 
       export DATABASE_NAME=v4-e2e-$(git log --format=%h -n 1 HEAD)
 
+      clean_e2e_db
       clean_e2e
-    displayName: "🧹 Clean cluster RG, and Vnet"
+    displayName: "🧹 Clean cluster RG, Vnet and DB"
     condition: always()

.pipelines/templates/template-deploy-e2e-db.yml

@@ -1,15 +1,13 @@
 parameters:
   workingDirectory: ""
-  rpMode: ""
 steps:
   - script: |
       cd ${{ parameters.workingDirectory }}
 
       . secrets/env
       . ./hack/e2e/run-rp-and-e2e.sh
-    
+
       export DATABASE_NAME=v4-e2e-$(git log --format=%h -n 1 HEAD)
 
       deploy_e2e_db
     displayName: "🚀 Deploy custom RP DB"
-    condition: eq(variables['RP_MODE'], 'development')

.pipelines/templates/template-kill-rp.yml

@@ -1,11 +0,0 @@
-parameters:
-  workingDirectory: ""
-steps:
-  - script: |
-      cd ${{ parameters.workingDirectory }}
-
-      . secrets/env
-      . ./hack/e2e/run-rp-and-e2e.sh
-      kill_rp
-    displayName: "🧹 Kill ARO RP"
-    condition: and(always(), eq(variables['RP_MODE'], 'development'))

.pipelines/templates/template-run-e2e.yml

@@ -1,11 +0,0 @@
-parameters:
-  workingDirectory: ""
-steps:
-  - script: |
-      cd ${{ parameters.workingDirectory }}
-
-      . secrets/env
-      . ./hack/e2e/run-rp-and-e2e.sh
-
-      run_e2e
-    displayName: "🚀 Run E2E"

.pipelines/templates/template-run-rp-and-e2e.yml

@@ -11,5 +11,7 @@ steps:
 
       run_rp
       validate_rp_running
-    displayName: "🚀 Run ARO RP"
-    condition: eq(variables['RP_MODE'], 'development')
+      register_sub
+      run_e2e
+      kill_rp
+    displayName: "🚀 Run ARO RP & E2E"

hack/e2e/run-rp-and-e2e.sh

@@ -81,11 +81,6 @@ deploy_e2e_deps() {
       --disable-private-link-service-network-policies true >/dev/null
 }
 
-set_cli_context() {
-    echo "########## Setting az cli context ##########"
-    az account set -s $AZURE_SUBSCRIPTION_ID
-}
-
 register_sub() {
     echo "########## 🔑 Registering subscription ##########"
     curl -k -X PUT \
@@ -139,32 +134,20 @@ echo "######################################"
 echo "######## Current settings : ##########"
 echo
 echo "LOCATION=$LOCATION"
-echo "AZURE_SUBSCRIPTION_ID=$AZURE_SUBSCRIPTION_ID"
 echo
-echo "RP_MODE=$RP_MODE"
-echo
-if [ $RP_MODE = "development" ] 
-then 
-    echo "COSMOSDB_ACCOUNT=$COSMOSDB_ACCOUNT"
-    echo "DATABASE_NAME=$DATABASE_NAME"
-    echo "RESOURCEGROUP=$RESOURCEGROUP"
-fi
+echo "COSMOSDB_ACCOUNT=$COSMOSDB_ACCOUNT"
+echo "DATABASE_NAME=$DATABASE_NAME"
+echo "RESOURCEGROUP=$RESOURCEGROUP"
 echo
 echo "CLUSTER=$CLUSTER"
 echo "CLUSTER_RESOURCEGROUP=$CLUSTER_RESOURCEGROUP"
 echo "KUBECONFIG=$KUBECONFIG"
 echo
-if [ $RP_MODE = "development" ]
-then 
-    echo "PROXY_HOSTNAME=$PROXY_HOSTNAME"
-fi
+echo "PROXY_HOSTNAME=$PROXY_HOSTNAME"
 echo "######################################"
 
 [ "$LOCATION" ] || ( echo ">> LOCATION is not set please validate your ./secrets/env"; exit 128 )
-if [ $RP_MODE = "development" ]
-then 
-    [ "$RESOURCEGROUP" ] || ( echo ">> RESOURCEGROUP is not set please validate your ./secrets/env"; exit 128 )
-    [ "$PROXY_HOSTNAME" ] || ( echo ">> PROXY_HOSTNAME is not set please validate your ./secrets/env"; exit 128 )
-    [ "$COSMOSDB_ACCOUNT" ] || ( echo ">> COSMOSDB_ACCOUNT is not set please validate your ./secrets/env"; exit 128 )
-    [ "$DATABASE_NAME" ] || ( echo ">> DATABASE_NAME is not set please validate your ./secrets/env"; exit 128 )
-fi
+[ "$RESOURCEGROUP" ] || ( echo ">> RESOURCEGROUP is not set please validate your ./secrets/env"; exit 128 )
+[ "$PROXY_HOSTNAME" ] || ( echo ">> PROXY_HOSTNAME is not set please validate your ./secrets/env"; exit 128 )
+[ "$COSMOSDB_ACCOUNT" ] || ( echo ">> COSMOSDB_ACCOUNT is not set please validate your ./secrets/env"; exit 128 )
+[ "$DATABASE_NAME" ] || ( echo ">> DATABASE_NAME is not set please validate your ./secrets/env"; exit 128 )