Skip to content

Commit

Permalink
Jenkins manifest update workflow switch runner and fix jdk14 install …
Browse files Browse the repository at this point in the history
…issues on docker images (#4957)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
  • Loading branch information
peterzhuamazon authored Aug 20, 2024
1 parent f2d7b9c commit 0909800
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion docker/ci/config/jdk-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ for jdk in ${JDKS}; do
ESUM=$(echo ${jdk} | cut -d '@' -f1)
BINARY_URL=$(echo ${jdk} | cut -d '@' -f2)
regex="temurin([0-9]+)[-]"
if [[ $jdk =~ $regex ]]; then
regex2="openjdk([0-9]+)[-]"
if [[ $jdk =~ $regex || $jdk =~ $regex2 ]]; then
MAJOR=${BASH_REMATCH[1]}
curl -LfsSo /tmp/openjdk-${MAJOR}.tar.gz ${BINARY_URL}
echo "${ESUM} */tmp/openjdk-${MAJOR}.tar.gz" | sha256sum -c -
Expand Down
4 changes: 3 additions & 1 deletion jenkins/manifests-update.jenkinsFile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pipeline {
agent {
docker {
label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3'
image 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1'
args '-e JAVA_HOME=/opt/java/openjdk-11'
registryUrl 'https://public.ecr.aws/'
alwaysPull true
Expand All @@ -32,6 +32,8 @@ pipeline {
withCredentials([usernamePassword(credentialsId: 'jenkins-github-bot-token', passwordVariable: 'GITHUB_TOKEN', usernameVariable: 'GITHUB_USER')]) {
try {
sh """
set +x
source /etc/profile.d/java_home.sh
git remote set-url origin https://opensearch-ci:${GITHUB_TOKEN}@github.com/opensearch-project/opensearch-build
git config user.email "opensearch-infra@amazon.com"
git config user.name "opensearch-ci"
Expand Down

0 comments on commit 0909800

Please sign in to comment.