From d5d7c34427a830e854e3f9a13e6cd7fa9e4223f3 Mon Sep 17 00:00:00 2001
From: Sameera PriyathamTadikonda <preethu4476@gmail.com>
Date: Thu, 6 Feb 2020 15:49:53 -0800
Subject: [PATCH] DHFPROD-4380: Moving the integration tests. updating snapshot
 to 5.2

Using 8443 port

Moving the integration tests to build and publish pipeline
---
 docker-compose.yml     |  2 +-
 e2e/docker-compose.yml |  2 +-
 explorerUIPipeline     | 21 ---------------------
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 64cb6fc3b3..7a2cea6d72 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     depends_on:
       - explorer
   explorer:
-    image: mlregistry.marklogic.com/explorer/explorer:5.1-snapshot
+    image: mlregistry.marklogic.com/explorer/explorer:5.2-snapshot
     container_name: "explorer"
     ports:
       - "8080:8080"
diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
index cf643acdfc..e75309ebe1 100644
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -6,7 +6,7 @@ services:
       dockerfile: Dockerfile
     image: "e2e"
     environment:
-      - CYPRESS_baseUrl=https://${HOSTNAME}:443
+      - CYPRESS_baseUrl=https://${HOSTNAME}:8443
     working_dir: /e2e
     volumes:
       - ./:/e2e
\ No newline at end of file
diff --git a/explorerUIPipeline b/explorerUIPipeline
index 54a130f5e5..2b5bb7128b 100644
--- a/explorerUIPipeline
+++ b/explorerUIPipeline
@@ -80,27 +80,6 @@ pipeline{
                   }
              }
 		}
-		stage('Integration-Tests'){
-		    when {
-                   branch 'develop'
-            }
-		    agent { label 'explorerLinux'}
-		    steps{
-		        sh 'sudo mladmin stop;docker rm -f $(docker ps -a -q) || true;'
-		        sh 'rm -rf $WORKSPACE/explorer-ui/e2e/results || true;cd $WORKSPACE/explorer-ui;docker-compose pull || true;dhvolume="$WORKSPACE/explorer-ui/e2e/qa-project/"  docker-compose up --build -d;sleep 45s;docker exec -i mldhf bash -c "sudo chmod -R 777 /projects; cd /projects;rm -rf .gradle;set +e;(./setup.sh || true);sudo  rm -rf build .gradle"; cd e2e; HOSTNAME=$(HOST=`hostname`;echo $HOST |cut -d"." -f1) docker-compose up --build'
-		        archiveArtifacts artifacts: 'explorer-ui/e2e/results/*.xml,explorer-ui/e2e/cypress/videos/*,explorer-ui/e2e/cypress/screenshots/**/*', onlyIfSuccessful: true
-		        junit '**/e2e/results/*.xml'
-
-		    }
-		    post{
-		        always{
-		         sh 'docker exec -i mldhf bash -c "sudo chmod -R 777 /projects;";docker rm -f $(docker ps -a -q)'
-		        }
-                unsuccessful{
-                    sendMail email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Explorer-UI_CI/detail/$JOB_BASE_NAME/$BUILD_ID  \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n Some of the  Integration Tests Failed on  $BRANCH_NAME. Please look into the issues and fix it.',false,'Integration Tests for $BRANCH_NAME Failed'
-                }
-		    }
-		}
 
 	}
 }