[CI] Extract Jenkins CLI jar from jenkins.war

INFINIOPS-296

What: Get jenkins-cli.jar from the bundled jenkins.war
instead of downloading it from repo.jenkins-ci.org.
How: Unzip WEB-INF/lib/cli-${JENKINS_VERSION}.jar out of
jenkins.war into /opt/jenkins-cli and clean up /tmp.
Why: The previously working repo.jenkins-ci.org URL now
returns HTTP 403, breaking the Jenkins image build.

Signed-off-by: Benny Itkin <bitkin@nvidia.com>

Author: BennyItkin

.github/Dockerfile.jenkins

@@ -10,7 +10,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends curl python3 py
   && rm -rf /var/lib/apt/lists/* \
   && mkdir -p /opt/jenkins-cli \
   && JENKINS_VERSION=$(/opt/java/openjdk/bin/java -jar /usr/share/jenkins/jenkins.war --version) \
-  && curl -fsSL "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/cli/${JENKINS_VERSION}/cli-${JENKINS_VERSION}.jar" -o /opt/jenkins-cli/jenkins-cli.jar \
+  && unzip /usr/share/jenkins/jenkins.war WEB-INF/lib/cli-${JENKINS_VERSION}.jar -d /tmp \
+  && mv /tmp/WEB-INF/lib/cli-${JENKINS_VERSION}.jar /opt/jenkins-cli/jenkins-cli.jar \
+  && rm -rf /tmp/WEB-INF/ \
   && chmod 0644 /opt/jenkins-cli/jenkins-cli.jar \
   && mkdir -p /opt/docker-bin \
   && arch="${TARGETARCH:-}" \

scripts/local_gha_ci.sh

@@ -296,8 +296,8 @@ jenkins_script() {
 save_jenkins_artifacts() {
   local prefix="$1"
   local build_number
-  build_number=$(docker exec "${JENKINS_NAME}" sh -lc "curl -sf http://localhost:8080/job/ci-demo/lastBuild/api/json" 2>/dev/null \
-    | sed -n 's/.*"number":[[:space:]]*\([0-9][0-9]*\).*/\1/p' | head -n1 || true)
+  build_number=$(docker exec "${JENKINS_NAME}" sh -lc "curl -sf 'http://localhost:8080/job/ci-demo/lastBuild/api/json?tree=number'" 2>/dev/null \
+    | grep -o '"number":[[:space:]]*[0-9][0-9]*' | grep -o '[0-9][0-9]*' | head -n1 || true)
 
   if [[ -n "${build_number}" ]]; then
     docker exec "${JENKINS_NAME}" sh -lc "curl -sf http://localhost:8080/job/ci-demo/${build_number}/consoleText" > "${LOG_DIR}/${prefix}.jenkins-console.log" 2>/dev/null || true
@@ -636,7 +636,7 @@ for conf in "${conf_files[@]}"; do
       fail_count=$((fail_count + 1))
     else
       echo "PASS ${conf_rel} TARGET_ARCH=${target_arch}"
-      if ! assert_stage_order "${conf}" "${LOG_DIR}/${output_prefix}.jenkins-console.log" "${conf_base} TARGET_ARCH=${target_arch}"; then
+      if ! assert_stage_order "${conf}" "${job_output_log}" "${conf_base} TARGET_ARCH=${target_arch}"; then
         fail_count=$((fail_count + 1))
       fi
     fi