Skip to content

Commit

Permalink
Merge pull request Marklogic-retired#223 in PROD/explorer-ui from ~ST…
Browse files Browse the repository at this point in the history
…ADIKON/explorer-ui:develop to develop

* commit 'd5d7c34427a830e854e3f9a13e6cd7fa9e4223f3':
  DHFPROD-4380: Moving the integration tests. updating snapshot to 5.2
  • Loading branch information
Bruce An authored and Bruce An committed Feb 7, 2020
2 parents a8aba19 + d5d7c34 commit b0249d5
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 23 deletions.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion e2e/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
21 changes: 0 additions & 21 deletions explorerUIPipeline
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}

}
}

0 comments on commit b0249d5

Please sign in to comment.