Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jenkins manifest update workflow switch runner and fix jdk14 install issues on docker images #4957

Merged
merged 2 commits into from
Aug 20, 2024
+5 −2
Merged

Jenkins manifest update workflow switch runner and fix jdk14 install issues on docker images #4957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1af42eb
Update manifest update workflow to use latest almalinux8 image and tw…
peterzhuamazon Aug 20, 2024
079175b
Ensure openjdk also get installed in docker
peterzhuamazon Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docker/ci/config/jdk-setup.sh
View file
Open in desktop
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
View file
Open in desktop
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 "[email protected]"
git config user.name "opensearch-ci"
Expand Down
Loading