|
@@ -10,6 +10,7 @@ pipeline {
|
|
|
options {
|
|
options {
|
|
|
timestamps()
|
|
timestamps()
|
|
|
parallelsAlwaysFailFast()
|
|
parallelsAlwaysFailFast()
|
|
|
|
|
+ retry(3)
|
|
|
timeout(time: 15, unit: 'MINUTES')
|
|
timeout(time: 15, unit: 'MINUTES')
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -20,8 +21,8 @@ pipeline {
|
|
|
AR_REPO_LOCATION = 'us-east1'
|
|
AR_REPO_LOCATION = 'us-east1'
|
|
|
AR_URL = 'us-east1-docker.pkg.dev/overleaf-ops/ol-docker'
|
|
AR_URL = 'us-east1-docker.pkg.dev/overleaf-ops/ol-docker'
|
|
|
BRANCH_NAME = "${env.CHANGE_BRANCH ? env.CHANGE_BRANCH : env.BRANCH_NAME}"
|
|
BRANCH_NAME = "${env.CHANGE_BRANCH ? env.CHANGE_BRANCH : env.BRANCH_NAME}"
|
|
|
- JENKINS_BUILD_NUMBER = "${BUILD_NUMBER}"
|
|
|
|
|
- BUILD_NUMBER = "${SHORT_SHA}_${BUILD_NUMBER}"
|
|
|
|
|
|
|
+ JENKINS_BUILD_NUMBER = "${BUILD_NUMBER}"
|
|
|
|
|
+ BUILD_NUMBER = "${SHORT_SHA}_${BUILD_NUMBER}"
|
|
|
DOCKER_COMPOSE_FLAGS = '-f docker-compose.ci.yml'
|
|
DOCKER_COMPOSE_FLAGS = '-f docker-compose.ci.yml'
|
|
|
COMMIT_SHA = "${GIT_COMMIT}"
|
|
COMMIT_SHA = "${GIT_COMMIT}"
|
|
|
SHORT_SHA = "${GIT_COMMIT.take(7)}"
|
|
SHORT_SHA = "${GIT_COMMIT.take(7)}"
|