[S] Change in osmo-ci[master]: jobs,scripts: $USER -> osmocom-build
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/44058?usp=email ) Change subject: jobs,scripts: $USER -> osmocom-build ...................................................................... jobs,scripts: $USER -> osmocom-build $USER is used in lots of docker image names, and it is always assumed to be set to osmocom-build. This isn't obvious when using the variable, let's set it to osmocom-build directly. Change-Id: I87cb8df00e99e1e4ac8cf41f14837b9d1ad12879 --- M jobs/coverity.yml M jobs/gerrit-lint.yml M jobs/gerrit-verifications-dahdi.yml M jobs/gerrit-verifications.yml M jobs/master-builds-dahdi.yml M jobs/master-builds.yml M jobs/osmocom-api.yml M jobs/osmocom-build-tags-against-master.yml M jobs/registry-rebuild-upload-fpga-build.yml M jobs/registry-rebuild-upload.yml M scripts/android/publish-apks-for-tags.sh M scripts/manuals/publish-manuals-for-tags.sh M scripts/osmocom-packages-docker.sh M scripts/tarballs/publish-tarballs-for-tags.sh 14 files changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/58/44058/1 diff --git a/jobs/coverity.yml b/jobs/coverity.yml index c70f1d1..fe8ff17 100644 --- a/jobs/coverity.yml +++ b/jobs/coverity.yml @@ -20,7 +20,7 @@ -v "$HOME/osmo-ci/coverity:/opt/osmo-ci/coverity:ro" \ -v "/opt/coverity:/opt/coverity:ro" \ -w /build/coverity \ - "$USER/debian-bookworm-build" \ + "osmocom-build/debian-bookworm-build" \ ./jenkins.sh publishers: - email: diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index d621aa5..1373873 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -62,7 +62,7 @@ -v ./code-from-gerrit:/build/code-from-gerrit \ -v ./osmo-ci:/build/osmo-ci \ -w /build/code-from-gerrit \ - "$USER/debian-trixie-build" \ + "osmocom-build/debian-trixie-build" \ /build/osmo-ci/lint/lint_diff.sh HEAD~1 wrappers: diff --git a/jobs/gerrit-verifications-dahdi.yml b/jobs/gerrit-verifications-dahdi.yml index 3711a05..b56350e 100644 --- a/jobs/gerrit-verifications-dahdi.yml +++ b/jobs/gerrit-verifications-dahdi.yml @@ -64,7 +64,7 @@ -e "KSRC=/linux" \ -v "$PWD:/build" \ -v "$HOME/linux.git:/linux.git:ro" \ - "$USER/debian-bookworm-build" \ + "osmocom-build/debian-bookworm-build" \ sh -e -x -c " git config --global --add safe.directory /linux.git git -C /linux.git -c color.ui=always log -1 --oneline {linux-repo-branch} diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index f3af22d..fef8780 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -313,7 +313,7 @@ DOCKER_IMG="{docker_img}" case "$JOB_TYPE" in firmware|gateware|manuals) - DOCKER_IMG="registry.osmocom.org/$USER/fpga-build" + DOCKER_IMG="registry.osmocom.org/osmocom-build/fpga-build" ;; esac docker pull "$DOCKER_IMG" diff --git a/jobs/master-builds-dahdi.yml b/jobs/master-builds-dahdi.yml index e5fdeac..a42e2d5 100644 --- a/jobs/master-builds-dahdi.yml +++ b/jobs/master-builds-dahdi.yml @@ -54,7 +54,7 @@ -e "KSRC=/linux" \ -v "$PWD:/build" \ -v "$HOME/linux.git:/linux.git:ro" \ - "$USER/debian-bookworm-build" \ + "osmocom-build/debian-bookworm-build" \ sh -e -x -c " git config --global --add safe.directory /linux.git git -C /linux.git -c color.ui=always log -1 --oneline {linux-repo-branch} diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index a54d93d..8185424 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -390,7 +390,7 @@ DOCKER_IMG="{docker_img}" case "$JOB_TYPE" in firmware|gateware) - DOCKER_IMG="registry.osmocom.org/$USER/fpga-build" + DOCKER_IMG="registry.osmocom.org/osmocom-build/fpga-build" ;; esac docker pull "$DOCKER_IMG" @@ -403,7 +403,7 @@ - docs_ftp.osmocom.org - ice40-usbtrace: repos_url: '{gitea_url}/electronics/{repos}' - docker_img: 'registry.osmocom.org/$USER/fpga-build' + docker_img: 'registry.osmocom.org/osmocom-build/fpga-build' cmd: | docker pull {docker_img} {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish @@ -412,7 +412,7 @@ - docs_ftp.osmocom.org - no2bootloader: repos_url: 'https://github.com/no2fpga/{repos}' - docker_img: 'registry.osmocom.org/$USER/fpga-build' + docker_img: 'registry.osmocom.org/osmocom-build/fpga-build' cmd: | docker pull {docker_img} {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish diff --git a/jobs/osmocom-api.yml b/jobs/osmocom-api.yml index 312496b..961f9c8 100644 --- a/jobs/osmocom-api.yml +++ b/jobs/osmocom-api.yml @@ -42,5 +42,5 @@ -v "$PWD:/build" \ -v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \ -w /build \ - "$USER/debian-bookworm-build" \ + "osmocom-build/debian-bookworm-build" \ scripts/osmocom-api-doxygen.sh diff --git a/jobs/osmocom-build-tags-against-master.yml b/jobs/osmocom-build-tags-against-master.yml index c3bbea2..9d9452d 100644 --- a/jobs/osmocom-build-tags-against-master.yml +++ b/jobs/osmocom-build-tags-against-master.yml @@ -31,7 +31,7 @@ -u build \ -v "$PWD:/build" \ -w /build \ - "$USER/debian-bookworm-build" \ + "osmocom-build/debian-bookworm-build" \ scripts/osmocom-build-old-tags-against-master.sh # Remove git repos and build results on success to free up space diff --git a/jobs/registry-rebuild-upload-fpga-build.yml b/jobs/registry-rebuild-upload-fpga-build.yml index fc158c6..74af502 100644 --- a/jobs/registry-rebuild-upload-fpga-build.yml +++ b/jobs/registry-rebuild-upload-fpga-build.yml @@ -26,7 +26,7 @@ cd debian-buster-build && make cd .. cd fpga-build && make REGISTRY_HOST=$REGISTRY - docker push $REGISTRY/$USER/fpga-build + docker push $REGISTRY/osmocom-build/fpga-build cd .. triggers: - timed: "H 00 * * H" diff --git a/jobs/registry-rebuild-upload.yml b/jobs/registry-rebuild-upload.yml index 1a4376f..4ea13c4 100644 --- a/jobs/registry-rebuild-upload.yml +++ b/jobs/registry-rebuild-upload.yml @@ -42,7 +42,7 @@ - shell: | REGISTRY="registry.osmocom.org" make -C "{image}" REGISTRY_HOST=$REGISTRY - docker push "$REGISTRY/$USER/{image}" + docker push "$REGISTRY/osmocom-build/{image}" properties: - build-discarder: num-to-keep: 120 diff --git a/scripts/android/publish-apks-for-tags.sh b/scripts/android/publish-apks-for-tags.sh index b0ddeed..d6bef52 100755 --- a/scripts/android/publish-apks-for-tags.sh +++ b/scripts/android/publish-apks-for-tags.sh @@ -7,7 +7,7 @@ TEMP="$OSMO_CI_DIR/_temp_apks" WEB_PATH="/downloads/home/binaries/web-files/android/.apks_testsig" SSH_COMMAND="ssh -o UserKnownHostsFile=$OSMO_CI_DIR/contrib/known_hosts -p 48" -DOCKER_IMAGE="$USER/debian-bookworm-android" +DOCKER_IMAGE="osmocom-build/debian-bookworm-android" LOG_PREFIX="::" OSMO_RELEASE_REPOS=" diff --git a/scripts/manuals/publish-manuals-for-tags.sh b/scripts/manuals/publish-manuals-for-tags.sh index 426d9bb..86c0877 100755 --- a/scripts/manuals/publish-manuals-for-tags.sh +++ b/scripts/manuals/publish-manuals-for-tags.sh @@ -5,7 +5,7 @@ L1_DIR="/tmp/osmo-layer1-headers" WEB_PATH="/downloads/home/docs/web-files" SSH_COMMAND="ssh -o UserKnownHostsFile=$TEMP/src/osmo-gsm-manuals/build/known_hosts -p 48" -DOCKER_IMAGE="$USER/debian-trixie-build" +DOCKER_IMAGE="osmocom-build/debian-trixie-build" LOG_PREFIX="::" # Releases that were made before shared osmo-gsm-manuals, or where build fails diff --git a/scripts/osmocom-packages-docker.sh b/scripts/osmocom-packages-docker.sh index 0dda19a..6f29688 100755 --- a/scripts/osmocom-packages-docker.sh +++ b/scripts/osmocom-packages-docker.sh @@ -33,5 +33,5 @@ -e "PROJ=$PROJ" \ -v "$SCRIPTS:/scripts" \ -v "$(realpath "$OSCRC"):/home/user/.oscrc" \ - "$USER/$IMAGE" \ + "osmocom-build/$IMAGE" \ sh -c "cd ~ && /scripts/$SCRIPT" diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh b/scripts/tarballs/publish-tarballs-for-tags.sh index b1d1983..b8fe1eb 100755 --- a/scripts/tarballs/publish-tarballs-for-tags.sh +++ b/scripts/tarballs/publish-tarballs-for-tags.sh @@ -4,7 +4,7 @@ TEMP="$OSMO_CI_DIR/_temp_releases" WEB_PATH="/downloads/home/releases/web-files" SSH_COMMAND="ssh -o UserKnownHostsFile=$OSMO_CI_DIR/contrib/known_hosts -p 48" -DOCKER_IMAGE="$USER/debian-bookworm-build" +DOCKER_IMAGE="osmocom-build/debian-bookworm-build" LOG_PREFIX="::" OSMO_RELEASE_REPOS=" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/44058?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I87cb8df00e99e1e4ac8cf41f14837b9d1ad12879 Gerrit-Change-Number: 44058 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith@sysmocom.de>
participants (1)
-
osmith