Skip to content

Commit d57a8e7

Browse files
committed
test: fix retry command exit status on workflow
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 53e4893 commit d57a8e7

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.circleci/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,9 @@ jobs:
243243
command: |
244244
N=3
245245
while [ $N -gt 0 ]; do
246-
PLATFORMS=${PLATFORMS} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build || true
247-
if [ $? -eq 0 ]; then
246+
output=$(eval "PLATFORMS=${PLATFORMS} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build")
247+
status=$?
248+
if [ $status -eq 0 ]; then
248249
echo "Build images passed"
249250
exit 0
250251
else
@@ -267,10 +268,9 @@ jobs:
267268
command: |
268269
N=3
269270
while [ $N -gt 0 ]; do
270-
PLATFORMS=${PLATFORMS} NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} \
271-
TEST_UPGRADE_CHART=false make chart_test_autoscaling_${TEST_STRATEGY} \
272-
&& make test_video_integrity || true
273-
if [ $? -eq 0 ]; then
271+
output=$(eval "PLATFORMS=${PLATFORMS} NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} TEST_UPGRADE_CHART=false make chart_test_autoscaling_${TEST_STRATEGY} && make test_video_integrity")
272+
status=$?
273+
if [ $status -eq 0 ]; then
274274
echo "Tests passed"
275275
exit 0
276276
else

generate_chart_changelog.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ generate_changelog() {
3939
# Get the changes for each section (Added, Removed, Fixed, Changed)
4040
image_tag_changes=$(echo "Chart is using image tag $CHART_APP_VERSION" | sed -e 's/^/- /')
4141
k8s_versions_tested=$(echo "Chart is tested on Kubernetes versions: $(cat .github/workflows/helm-chart-test.yml | grep -oP "k8s-version: '\Kv.*(?=')" | tr '\n' ',' | sed s/,/,\ /g)" | sed -e 's/^/- /')
42-
docker_versions_tested=$(echo "Chart is tested on container runtime Docker versions: $(cat .github/workflows/helm-chart-test.yml | grep -oP "docker-version: '\Kv.*(?=')" | tr '\n' ',' | sed s/,/,\ /g)" | sed -e 's/^/- /')
42+
docker_versions_tested=$(echo "Chart is tested on container runtime Docker versions: $(cat .github/workflows/helm-chart-test.yml | grep -oP "docker-version: '\K.*(?=')" | tr '\n' ',' | sed s/,/,\ /g)" | sed -e 's/^/- /')
4343
helm_versions_tested=$(echo "Chart is tested on Helm versions: $(cat .github/workflows/helm-chart-test.yml | grep -oP "helm-version: '\Kv.*(?=')" | tr '\n' ',' | sed s/,/,\ /g)" | sed -e 's/^/- /')
4444
added_changes=$(git log --pretty=format:"[\`%h\`](http://github.com/seleniumhq/docker-selenium/commit/%H) - %s :: %an" "$commit_range" -- "$CHART_DIR" | grep -iE "\- feat|\- add" | sed -e 's/^/- /')
4545
removed_changes=$(git log --pretty=format:"[\`%h\`](http://github.com/seleniumhq/docker-selenium/commit/%H) - %s :: %an" "$commit_range" -- "$CHART_DIR" | grep -iE "\- remove|\- deprecate|\- delete" | sed -e 's/^/- /')

0 commit comments

Comments
 (0)