Skip to content

Commit 1e7578e

Browse files
oluwolenpbcoluwolenpbcoluwolenpbc
authored
PLT-467 downgrading docker compose & removing e2e test (#1332)
* downgrading docker compose * change retries to 10 * update healthcheck * adding startupn script * removing e2e test * removing extra wait --------- Co-authored-by: oluwolenpbc <[email protected]> Co-authored-by: oluwolenpbc <[email protected]>
1 parent 220ef80 commit 1e7578e

File tree

3 files changed

+2
-37
lines changed

3 files changed

+2
-37
lines changed

Jenkinsfile

-35
Original file line numberDiff line numberDiff line change
@@ -143,41 +143,6 @@ pipeline {
143143
}
144144
}
145145

146-
147-
stage('Run e2e-test') {
148-
149-
steps {
150-
151-
withCredentials([file(credentialsId: 'SANDBOX_BFD_KEYSTORE', variable: 'SANDBOX_BFD_KEYSTORE'),
152-
string(credentialsId: 'SANDBOX_BFD_KEYSTORE_PASSWORD', variable: 'AB2D_BFD_KEYSTORE_PASSWORD'),
153-
usernamePassword(credentialsId: 'artifactoryuserpass', usernameVariable: 'ARTIFACTORY_USER', passwordVariable: 'ARTIFACTORY_PASSWORD')]) {
154-
155-
sh '''
156-
export AB2D_BFD_KEYSTORE_LOCATION="/opt/ab2d/ab2d_bfd_keystore"
157-
158-
export KEYSTORE_LOCATION="$WORKSPACE/opt/ab2d/ab2d_bfd_keystore"
159-
160-
export JENKINS_UID=$(id -u)
161-
export JENKINS_GID=$(id -g)
162-
163-
cp $SANDBOX_BFD_KEYSTORE $KEYSTORE_LOCATION
164-
165-
test -f $KEYSTORE_LOCATION && echo "created keystore file"
166-
167-
chmod 666 $KEYSTORE_LOCATION
168-
169-
ls -la $KEYSTORE_LOCATION
170-
171-
# Log into ECR for Docker Compose in e2e tests
172-
aws --region "${AWS_DEFAULT_REGION}" ecr get-login-password |
173-
docker login --username AWS --password-stdin "${ECR_REPO_ENV_AWS_ACCOUNT_NUMBER}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com"
174-
175-
mvn test -s settings.xml -pl e2e-test -am -Dtest=TestRunner -DfailIfNoTests=false -Dusername=${ARTIFACTORY_USER} -Dpassword=${ARTIFACTORY_PASSWORD} -Drepository_url=${ARTIFACTORY_URL}
176-
'''
177-
}
178-
}
179-
}
180-
181146
stage('Run codeclimate tests') {
182147

183148
steps {

docker-compose.jenkins.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3'
1+
version: '2.4'
22

33
##################
44
# Overrides specific properties of original compose for CI environment

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3'
1+
version: '2.4'
22

33
services:
44
db:

0 commit comments

Comments
 (0)