Skip to content

Commit

Permalink
Update the docker used for BWC
Browse files Browse the repository at this point in the history
Signed-off-by: Zelin Hao <[email protected]>
  • Loading branch information
zelinh committed Feb 1, 2024
1 parent 9db2234 commit 630eb5d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions jenkins/opensearch/bwc-test.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
* compatible open source license.
*/

lib = library(identifier: 'jenkins@1.0.4', retriever: modernSCM([
lib = library(identifier: 'jenkins@bwc-test', retriever: modernSCM([
$class: 'GitSCMSource',
remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
remote: 'https://github.com/zelinh/opensearch-build-libraries.git',
]))

pipeline {
Expand Down Expand Up @@ -61,8 +61,8 @@ pipeline {
Rebuilding of this job will result in considering upstream build as self($JOB_NAME) See https://issues.jenkins.io/browse/JENKINS-61590 for bug
Either trigger from expected upstream job or run a new build
*/
env.BUILD_JOB_NAME = currentBuild.upstreamBuilds ?
currentBuild.upstreamBuilds[0].fullProjectName :
env.BUILD_JOB_NAME = currentBuild.upstreamBuilds ?
currentBuild.upstreamBuilds[0].fullProjectName :
env.DEFAULT_BUILD_JOB_NAME
}
}
Expand All @@ -71,13 +71,13 @@ pipeline {
agent {
docker {
label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
image 'opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028'
image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3'
registryUrl 'https://public.ecr.aws/'
alwaysPull true
}
}
steps {
script {
script {
DOCKER_AGENT = detectTestDockerAgent()
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
bwc-test.script(groovy.lang.Closure)
bwc-test.fileExists(manifests/tests/jenkins/data/opensearch-1.3.0-test.yml)
bwc-test.stage(detect docker image + args, groovy.lang.Closure)
bwc-test.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
bwc-test.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
bwc-test.script(groovy.lang.Closure)
bwc-test.detectTestDockerAgent()
detectTestDockerAgent.legacySCM(groovy.lang.Closure)
Expand Down

0 comments on commit 630eb5d

Please sign in to comment.