Skip to content

Commit ac8fa0d

Browse files
committed
Cleanup CI file
1 parent b2592d9 commit ac8fa0d

File tree

1 file changed

+2
-29
lines changed

1 file changed

+2
-29
lines changed

Jenkinsfile

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -77,28 +77,10 @@ pipeline {
7777
steps {
7878
withCredentials([string(credentialsId: 'npm-sentry-dsn', variable: 'SENTRY_DSN')]) {
7979
withCredentials([usernamePassword(credentialsId: 'oss-index-token', passwordVariable: 'NANCY_TOKEN', usernameVariable: 'NANCY_USER')]) {
80-
script {
81-
def shStatusCode = sh(label: 'test-backend', returnStatus: true, script: '''
82-
set -e
83-
./scripts/ci/test-backend | sed -r "s/\\x1B\\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" > ${WORKSPACE}/tmp-sh-build 2>&1
84-
''')
85-
shOutput = readFile "${env.WORKSPACE}/tmp-sh-build"
86-
if (shStatusCode != 0) {
87-
error "${shOutput}"
88-
}
89-
}
80+
sh './scripts/ci/test-backend'
9081
}
9182
// Build all the golang binaries
92-
script {
93-
def shStatusCode = sh(label: 'build-backend', returnStatus: true, script: '''
94-
set -e
95-
./scripts/ci/build-backend > ${WORKSPACE}/tmp-sh-build 2>&1
96-
''')
97-
shOutput = readFile "${env.WORKSPACE}/tmp-sh-build"
98-
if (shStatusCode != 0) {
99-
error "${shOutput}"
100-
}
101-
}
83+
sh './scripts/ci/build-backend'
10284
// Build the docker image used for testing below
10385
sh '''docker build --pull --no-cache \\
10486
-t "${IMAGE}:${BRANCH_LOWER}-ci-${BUILD_NUMBER}" \\
@@ -111,12 +93,6 @@ pipeline {
11193
}
11294
}
11395
post {
114-
always {
115-
sh 'rm -f ${WORKSPACE}/tmp-sh-build'
116-
}
117-
failure {
118-
npmGithubPrComment("CI Error:\n\n```\n${shOutput}\n```", true)
119-
}
12096
success {
12197
archiveArtifacts allowEmptyArchive: false, artifacts: 'bin/*'
12298
script {
@@ -136,7 +112,6 @@ pipeline {
136112
}
137113
}
138114
steps {
139-
sh 'docker-compose config'
140115
sh 'rm -rf ./test/results/junit/*'
141116
sh './scripts/ci/fulltest-cypress'
142117
}
@@ -167,7 +142,6 @@ pipeline {
167142
}
168143
}
169144
steps {
170-
sh 'docker-compose config'
171145
sh 'rm -rf ./test/results/junit/*'
172146
sh './scripts/ci/fulltest-cypress'
173147
}
@@ -196,7 +170,6 @@ pipeline {
196170
}
197171
}
198172
steps {
199-
sh 'docker-compose config'
200173
sh 'rm -rf ./test/results/junit/*'
201174
sh './scripts/ci/fulltest-cypress'
202175
}

0 commit comments

Comments
 (0)