Skip to content

Commit

Permalink
Move util scripts to scripts/util (#6463)
Browse files Browse the repository at this point in the history
  • Loading branch information
danish9039 authored Jan 2, 2025
1 parent e9eb59e commit 275e766
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-lint-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,4 @@ jobs:

- name: Run unit tests for scripts
run: |
SHUNIT2=.tools/shunit2 bash scripts/compute-tags.test.sh
SHUNIT2=.tools/shunit2 bash scripts/util/compute-tags.test.sh
4 changes: 2 additions & 2 deletions scripts/build/build-crossdock.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ make build-and-run-crossdock
if [[ "$BRANCH" == "main" ]]; then
echo 'upload images to dockerhub/quay.io'
REPO=jaegertracing/test-driver
IFS=" " read -r -a IMAGE_TAGS <<< "$(bash scripts/compute-tags.sh ${REPO})"
IFS=" " read -r -a IMAGE_TAGS <<< "$(bash scripts/util/compute-tags.sh ${REPO})"
IMAGE_TAGS+=("--tag" "docker.io/${REPO}:${COMMIT}" "--tag" "quay.io/${REPO}:${COMMIT}")
bash scripts/docker-login.sh
bash scripts/util/docker-login.sh

docker buildx build --push \
--progress=plain \
Expand Down
4 changes: 2 additions & 2 deletions scripts/build/build-upload-a-docker-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ if [[ "${local_test_only}" = "Y" ]]; then
else
echo "::group:: compute tags ${component_name}"
# shellcheck disable=SC2086
IFS=" " read -r -a IMAGE_TAGS <<< "$(bash scripts/compute-tags.sh ${namespace}/${component_name})"
IFS=" " read -r -a IMAGE_TAGS <<< "$(bash scripts/util/compute-tags.sh ${namespace}/${component_name})"
echo "::endgroup::"

# Only push multi-arch images to dockerhub/quay.io for main branch or for release tags vM.N.P{-rcX}
if [[ "$BRANCH" == "main" || $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]+)?$ ]]; then
echo "will build docker images and upload to dockerhub/quay.io, BRANCH=$BRANCH"
bash scripts/docker-login.sh
bash scripts/util/docker-login.sh
PUSHTAG="type=image,push=true"
upload_comment=" and uploading"
if [[ "$overwrite" == 'N' ]]; then
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 275e766

Please sign in to comment.