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

Fix missed jar path reassignment in jenkins-agent script #38707

Merged
merged 2 commits into from
Jan 27, 2025
Merged

Fix missed jar path reassignment in jenkins-agent script #38707

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcc9cf1
Fix missed jar path reassignment
cailafinn Jan 27, 2025
576c4db
Assign the jar file before checking if it's running
cailafinn Jan 27, 2025
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
6 changes: 4 additions & 2 deletions buildconfig/Jenkins/jenkins-agent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ fi
if [[ "$OSTYPE" == "darwin"* ]] && [[ $(uname -m) == 'arm64' ]]; then
JAR_FILE=$ARM_JAR_FILE
JAR_LOCATION="${JENKINS_URL}/jnlpJars"
JAVA_ARGS="${PROXY_ARGS} -jar ${JAR_FILE} -url ${JENKINS_URL} -secret ${SECRET} -name ${NODE_NAME}"
JAR_ARGS="-url ${JENKINS_URL} -secret ${SECRET} -name ${NODE_NAME}"
else
JAR_FILE=$LEGACY_JAR_FILE
JAR_LOCATION="${LEGACY_JENKINS_REPO_URL}/${LEGACY_JAR_VERSION}"
JAVA_ARGS="${PROXY_ARGS} -jar ${JAR_FILE} -jnlpUrl ${AGENT_URL} -secret ${SECRET}"
JAR_ARGS="-jnlpUrl ${AGENT_URL} -secret ${SECRET}"
fi

# find the jar file if it exists
Expand All @@ -123,6 +123,8 @@ else
JAR_FILE=${JAR_FILE_TMP}
fi

JAVA_ARGS="${PROXY_ARGS} -jar ${JAR_FILE} ${JAR_ARGS}"

echo "starting ..."
if [ -z "${JAVA}" ]; then
JAVA=`which java`
Expand Down
Loading