Skip to content

Commit

Permalink
Jenkins debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
webbnh committed Jul 7, 2022
1 parent 74f1070 commit 5d7f8fd
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
4 changes: 4 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@
# PODMAN_USR - the username for the container registry account
# PODMAN_PSW - the password for the container registry account
#

PODMAN_USR=${PODMAN_USR-"pbench+mr_jenkins"}
PODMAN_PSW=${PODMAN_PSW-${DEFAULT_PODMAN_PASSWORD}}
COPR_CONFIG=${COPR_CONFIG:-"${HOME}/.config/copr"}

# DEBUG
echo "COPR_CONFIG: $(tr 'A-Za-z' 'N-ZA-Mn-za-m' <<< ${COPR_CONFIG})"
echo "COPR_CONFIG:copr_url=$(grep copr_url ${COPR_CONFIG})" >&2

# Function to read an initialization/configuration file and print the value of
# the specified key in the specified section. Borrowed from
Expand Down
13 changes: 7 additions & 6 deletions jenkins/Pipeline.gy
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
pipeline {
agent { label 'pbench' }
environment {
COPR_CONFIG=credentials('cce995d4-0bfc-44d8-b4fb-cf5641a56639')
COPR_USER="wscales"
EXTRA_PODMAN_SWITCHES="--pull=always -e COV_REPORT_XML=yes"
// COPR_CONFIG=credentials('cce995d4-0bfc-44d8-b4fb-cf5641a56639') // External COPR
COPR_CONFIG=credentials('6fe4042e-8e9e-43d4-b0cf-909459c8c6fb') // Internal COPR
EXTRA_PODMAN_SWITCHES="--pull=always -e=COV_REPORT_XML=yes -e=COPR_CONFIG -e=PODMAN* -v=${COPR_CONFIG}:\${HOME_DIR}/.config/copr"
IMAGE_KIND="fedora"
IMAGE_REPO="quay.io/pbench"
IMAGE_ROLE="ci"
Expand All @@ -18,9 +18,10 @@ pipeline {
// This symlink papers over the difference in location of the
// pbench sources inside and outside the container, which allows
// the Cobertura plug-in to find the sources referenced in the
// coverage report.
sh 'ln -s . pbench'
sh 'jenkins/run build.sh'
// coverage report. However, the link may already exist from a
// previous run of this pipeline, in which case log the result.
sh 'ln -sT . pbench || pwd && ls -ld pbench'
sh 'jenkins/run ./build.sh'
}
}
stage('Agent Python3.6 Check') {
Expand Down

0 comments on commit 5d7f8fd

Please sign in to comment.