Skip to content

Commit b41fcdf

Browse files
committed
jenkins: debug
1 parent 503e086 commit b41fcdf

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

.github/workflows/build-pull-request-jenkins.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@ jobs:
2626
BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
2727
GIT_COMMIT: ${{ github.event.pull_request.head.sha }}
2828
REPO_URL: ${{ github.event.pull_request.head.repo.clone_url }}
29+
BUILDX_DRIVER: ${{ vars.JENKINS_BUILDX_DRIVER || 'docker' }}
2930
steps:
3031
- name: Validate Jenkins configuration
3132
run: |
3233
set -euo pipefail
33-
for var in JENKINS_URL JENKINS_JOB JENKINS_USER JENKINS_TOKEN BRANCH_NAME GIT_COMMIT REPO_URL; do
34+
for var in JENKINS_URL JENKINS_JOB JENKINS_USER JENKINS_TOKEN BRANCH_NAME GIT_COMMIT REPO_URL BUILDX_DRIVER; do
3435
if [ -z "${!var:-}" ]; then
3536
echo "::error::Missing required value for ${var}"
3637
exit 1
@@ -64,6 +65,7 @@ jobs:
6465
--data-urlencode "BRANCH_NAME=${BRANCH_NAME}" \
6566
--data-urlencode "GIT_COMMIT=${GIT_COMMIT}" \
6667
--data-urlencode "REPO_URL=${REPO_URL}" \
68+
--data-urlencode "BUILDX_DRIVER=${BUILDX_DRIVER}" \
6769
--dump-header "$response_headers" \
6870
--output /dev/null \
6971
"${JENKINS_URL}/job/${JENKINS_JOB}/buildWithParameters"
@@ -79,6 +81,7 @@ jobs:
7981
echo "- Job: \`${JENKINS_JOB}\`"
8082
echo "- Branch: \`${BRANCH_NAME}\`"
8183
echo "- Commit: \`${GIT_COMMIT}\`"
84+
echo "- Buildx driver: \`${BUILDX_DRIVER}\`"
8285
echo "- Queue item: ${queue_url}"
8386
} >> "$GITHUB_STEP_SUMMARY"
8487
fi

Jenkinsfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pipeline {
4141
echo "PARAM_BRANCH_NAME=${params.BRANCH_NAME}"
4242
echo "PARAM_GIT_COMMIT=${params.GIT_COMMIT}"
4343
echo "PARAM_REPO_URL=${params.REPO_URL}"
44-
echo "PARAM_BUILDX_DRIVER=${params.BUILDX_DRIVER}"
44+
echo "PARAM_BUILDX_DRIVER=${params.BUILDX_DRIVER ?: 'docker'}"
4545
echo "JOB_NAME=${env.JOB_NAME}"
4646
echo "BUILD_NUMBER=${env.BUILD_NUMBER}"
4747
echo "BUILD_URL=${env.BUILD_URL}"
@@ -119,7 +119,8 @@ pipeline {
119119
echo "ARTIFACT_DIR=${ARTIFACT_DIR}"
120120
echo "STAR_BASE=${STAR_BASE}"
121121
echo "COMPILER=${COMPILER}"
122-
echo "BUILDX_DRIVER=${BUILDX_DRIVER}"
122+
driver="${BUILDX_DRIVER:-docker}"
123+
echo "BUILDX_DRIVER=${driver}"
123124
echo "PATH=${PATH}"
124125
command -v docker
125126
docker --version
@@ -172,11 +173,12 @@ pipeline {
172173
steps {
173174
sh '''
174175
set -euxo pipefail
176+
driver="${BUILDX_DRIVER:-docker}"
175177
builder_name="star-sw-${BUILD_NUMBER}-${STAR_BASE}-${COMPILER}"
176178
echo "${builder_name}" > .buildx-builder-name
177179
docker buildx rm "${builder_name}" || true
178180
179-
if [ "${BUILDX_DRIVER}" = "docker-container" ]; then
181+
if [ "${driver}" = "docker-container" ]; then
180182
docker buildx create \
181183
--name "${builder_name}" \
182184
--driver docker-container \
@@ -198,6 +200,7 @@ pipeline {
198200
steps {
199201
sh '''
200202
set -euxo pipefail
203+
driver="${BUILDX_DRIVER:-docker}"
201204
builder_name="$(cat .buildx-builder-name)"
202205
starenv="${STAR_BASE}-${COMPILER}"
203206
image_tag="ghcr.io/star-bnl/star-sw-${starenv}"
@@ -206,6 +209,7 @@ pipeline {
206209
mkdir -p "${ARTIFACT_DIR}"
207210
208211
echo "=== Building ${image_tag} ==="
212+
echo "=== Using Buildx driver ${driver} ==="
209213
docker buildx build \
210214
--builder "${builder_name}" \
211215
--progress plain \

0 commit comments

Comments
 (0)