Skip to content

Commit

Permalink
Clean-up some linter warnings in build scripts (#4823)
Browse files Browse the repository at this point in the history
## Which problem is this PR solving?
- Part of #4822

## Description of the changes
- Address some linter warnings

## How was this change tested?
- CI

---------

Signed-off-by: Yuri Shkuro <[email protected]>
  • Loading branch information
yurishkuro authored Oct 8, 2023
1 parent 9831d87 commit 6e90a49
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
12 changes: 6 additions & 6 deletions scripts/build-upload-docker-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ mode=${1-main}

make build-binaries-linux

if [ "$mode" = "pr-only" ]; then
if [[ "$mode" == "pr-only" ]]; then
make create-baseimg
# build artifacts for linux/amd64 only for pull requests
platforms="linux/amd64"
Expand All @@ -22,11 +22,11 @@ fi
# build/upload raw and debug images of Jaeger backend components
for component in agent collector query ingester remote-storage
do
bash scripts/build-upload-a-docker-image.sh -b -c "jaeger-${component}" -d "cmd/${component}" -p "${platforms}" -t release
if ["$mode" != "pr-only"]; then
#do not run debug image build when it is pr-only
bash scripts/build-upload-a-docker-image.sh -b -c "jaeger-${component}" -d "cmd/${component}" -p "${platforms}" -t release
# do not need debug image built for PRs
if [[ "$mode" != "pr-only" ]]; then
bash scripts/build-upload-a-docker-image.sh -b -c "jaeger-${component}-debug" -d "cmd/${component}" -t debug
fi
fi
done

bash scripts/build-upload-a-docker-image.sh -b -c jaeger-es-index-cleaner -d cmd/es-index-cleaner -p "${platforms}" -t release
Expand All @@ -36,5 +36,5 @@ bash scripts/build-upload-a-docker-image.sh -c jaeger-cassandra-schema -d plugin
# build/upload images for jaeger-tracegen and jaeger-anonymizer
for component in tracegen anonymizer
do
bash scripts/build-upload-a-docker-image.sh -c "jaeger-${component}" -d "cmd/${component}" -p "${platforms}"
bash scripts/build-upload-a-docker-image.sh -c "jaeger-${component}" -d "cmd/${component}" -p "${platforms}"
done
1 change: 1 addition & 0 deletions scripts/es-integration-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ bring_up_storage() {
echo "starting ${distro} ${version}"
for retry in 1 2 3
do
echo "attempt $retry"
if [ ${distro} = "elasticsearch" ]; then
cid=$(setup_es ${version})
elif [ ${distro} == "opensearch" ]; then
Expand Down
1 change: 1 addition & 0 deletions scripts/import-order-cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

set -e

# shellcheck disable=SC2046 -- we want multple arguments here
./scripts/import-order-cleanup.py -o $1 -t $(git ls-files "*\.go" | \
grep -v \
-e thrift-gen \
Expand Down
1 change: 1 addition & 0 deletions scripts/updateLicenses.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

set -e

# shellcheck disable=SC2046 -- we want multple arguments here
./scripts/updateLicense.py $(git ls-files "*\.go" | \
grep -v \
-e thrift-gen \
Expand Down

0 comments on commit 6e90a49

Please sign in to comment.