Skip to content

Commit 6b9a797

Browse files
shreddedbaconshreddedbacon
committed
refactor: adjust function names and add buildimages start delimiter
1 parent 39719e6 commit 6b9a797

File tree

1 file changed

+37
-34
lines changed

1 file changed

+37
-34
lines changed

‎legacy/build-deploy-docker-compose.sh‎

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ function projectEnvironmentVariableCheck() {
9797

9898
SCC_CHECK=$(kubectl -n ${NAMESPACE} get pod ${LAGOON_BUILD_NAME} -o json | jq -r '.metadata.annotations."openshift.io/scc" // false')
9999

100+
# begin build step will echo the step start delimeter and then patch kubernetes resource with the value
100101
function beginBuildStep() {
101102
[ "$1" ] || return #Buildstep start
102103
[ "$2" ] || return #buildstep
@@ -112,7 +113,8 @@ function beginBuildStep() {
112113
fi
113114
}
114115

115-
function patchBuildStep() {
116+
# finalize build step will echo the end delimeter only
117+
function finalizeBuildStep() {
116118
[ "$1" ] || return #total start time
117119
[ "$2" ] || return #step start time
118120
[ "$3" ] || return #previous step end time
@@ -201,7 +203,7 @@ fi
201203

202204
set +e
203205
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
204-
patchBuildStep "${buildStartTime}" "${buildStartTime}" "${currentStepEnd}" "${NAMESPACE}" "initialSetup" "Initial Environment Setup" "false"
206+
finalizeBuildStep "${buildStartTime}" "${buildStartTime}" "${currentStepEnd}" "${NAMESPACE}" "initialSetup" "Initial Environment Setup" "false"
205207
previousStepEnd=${currentStepEnd}
206208
beginBuildStep "Docker Compose Validation" "dockerComposeValidation"
207209
DOCKER_COMPOSE_WARNING_COUNT=0
@@ -213,7 +215,7 @@ dccOutput=$(bash -c 'build-deploy-tool validate docker-compose --docker-compose
213215
dccExit=$?
214216
if [ "${dccExit}" != "0" ]; then
215217
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
216-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "dockerComposeValidationError" "Docker Compose Validation" "false"
218+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "dockerComposeValidationError" "Docker Compose Validation" "false"
217219
previousStepEnd=${currentStepEnd}
218220
echo "
219221
##############################################
@@ -300,11 +302,11 @@ if [[ "$DOCKER_COMPOSE_WARNING_COUNT" -gt 0 ]]; then
300302
"
301303
echo "##############################################"
302304
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
303-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "dockerComposeValidationWarning" "Docker Compose Validation" "true"
305+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "dockerComposeValidationWarning" "Docker Compose Validation" "true"
304306
previousStepEnd=${currentStepEnd}
305307
else
306308
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
307-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "dockerComposeValidation" "Docker Compose Validation" "false"
309+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "dockerComposeValidation" "Docker Compose Validation" "false"
308310
previousStepEnd=${currentStepEnd}
309311
fi
310312

@@ -328,7 +330,7 @@ lyvExit=$?
328330

329331
if [ "${lyvExit}" != "0" ]; then
330332
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
331-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "lagoonYmlValidationError" ".lagoon.yml Validation" "false"
333+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "lagoonYmlValidationError" ".lagoon.yml Validation" "false"
332334
previousStepEnd=${currentStepEnd}
333335
echo "
334336
##############################################
@@ -376,7 +378,7 @@ fi
376378
##################
377379

378380
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
379-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "lagoonYmlValidation" ".lagoon.yml Validation" "false"
381+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "lagoonYmlValidation" ".lagoon.yml Validation" "false"
380382
previousStepEnd=${currentStepEnd}
381383
beginBuildStep "Configure Variables" "configuringVariables"
382384
DEPLOY_TYPE=$(cat .lagoon.yml | shyaml get-value environments.${BRANCH//./\\.}.deploy-type default)
@@ -566,7 +568,7 @@ if [ ! -z "$LAGOON_ENVIRONMENT_VARIABLES" ]; then
566568
fi
567569

568570
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
569-
patchBuildStep "${buildStartTime}" "${buildStartTime}" "${currentStepEnd}" "${NAMESPACE}" "configureVars" "Configure Variables" "false"
571+
finalizeBuildStep "${buildStartTime}" "${buildStartTime}" "${currentStepEnd}" "${NAMESPACE}" "configureVars" "Configure Variables" "false"
570572
previousStepEnd=${currentStepEnd}
571573
beginBuildStep "Container Registry Login" "registryLogin"
572574

@@ -610,8 +612,9 @@ do
610612
done
611613

612614
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
613-
patchBuildStep "${buildStartTime}" "${buildStartTime}" "${currentStepEnd}" "${NAMESPACE}" "registryLogin" "Container Registry Login" "false"
614-
615+
finalizeBuildStep "${buildStartTime}" "${buildStartTime}" "${currentStepEnd}" "${NAMESPACE}" "registryLogin" "Container Registry Login" "false"
616+
previousStepEnd=${currentStepEnd}
617+
beginBuildStep "Image Builds" "buildingImages"
615618

616619
##############################################
617620
### BUILD IMAGES
@@ -662,7 +665,7 @@ if [[ "$BUILD_TYPE" == "pullrequest" || "$BUILD_TYPE" == "branch" ]]; then
662665
fi
663666
else
664667
previousStepEnd=${currentStepEnd}
665-
beginBuildStep "Building Image ${SERVICE_NAME}" "buildingImage${SERVICE_NAME_TITLE}"
668+
beginBuildStep "Building Image ${SERVICE_NAME}" "buildingImage-${SERVICE_NAME_TITLE}"
666669
# otherwise extract build information from the image build data payload
667670
# this is a temporary image name to use for the build, it is based on the namespace and service, this can probably be deprecated and the images could just be
668671
# built with the name they are meant to be. only 1 build can run at a time within a namespace
@@ -696,7 +699,7 @@ if [[ "$BUILD_TYPE" == "pullrequest" || "$BUILD_TYPE" == "branch" ]]; then
696699
# adding the build image to the list of arguments passed into the next image builds
697700
SERVICE_NAME_UPPERCASE=$(echo "$SERVICE_NAME" | tr '[:lower:]' '[:upper:]')
698701
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
699-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "imageBuild${SERVICE_NAME_TITLE}Complete" "Building Image ${SERVICE_NAME}" "false"
702+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "imageBuild${SERVICE_NAME_TITLE}Complete" "Building Image ${SERVICE_NAME}" "false"
700703
fi
701704
done
702705

@@ -710,7 +713,7 @@ if [[ "$BUILD_TYPE" == "pullrequest" || "$BUILD_TYPE" == "branch" ]]; then
710713
echo "- ${IMAGE_NAME}: ${PULL_IMAGE}"
711714
done
712715
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
713-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "pulledImageInfoComplete" "Pulled Images" "false"
716+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "pulledImageInfoComplete" "Pulled Images" "false"
714717
fi
715718

716719
previousStepEnd=${currentStepEnd}
@@ -733,7 +736,7 @@ if [[ "$BUILD_TYPE" == "pullrequest" || "$BUILD_TYPE" == "branch" ]]; then
733736
done
734737

735738
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
736-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "imageBuildStatsComplete" "Image Build Stats" "false"
739+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "imageBuildStatsComplete" "Image Build Stats" "false"
737740
fi
738741
if [[ "$BUILD_TYPE" == "promote" ]]; then
739742
echo "No images built for promote environments"
@@ -815,7 +818,7 @@ LAGOON_PR_NUMBER=${PR_NUMBER}\n\
815818
fi
816819

817820
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
818-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "serviceConfigurationComplete" "Service Configuration Phase 1" "false"
821+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "serviceConfigurationComplete" "Service Configuration Phase 1" "false"
819822
previousStepEnd=${currentStepEnd}
820823
beginBuildStep "Service Configuration Phase 2" "serviceConfigurationPhase2"
821824

@@ -922,7 +925,7 @@ if [ -n "$(ls -A $LAGOON_DBAAS_YAML_FOLDER/ 2>/dev/null)" ]; then
922925
fi
923926

924927
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
925-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "serviceConfiguration2Complete" "Service Configuration Phase 2" "false"
928+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "serviceConfiguration2Complete" "Service Configuration Phase 2" "false"
926929
previousStepEnd=${currentStepEnd}
927930
beginBuildStep "Route/Ingress Configuration" "configuringRoutes"
928931

@@ -962,7 +965,7 @@ else
962965
fi
963966

964967
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
965-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "configuringRoutesComplete" "Route/Ingress Configuration" "false"
968+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "configuringRoutesComplete" "Route/Ingress Configuration" "false"
966969
previousStepEnd=${currentStepEnd}
967970
beginBuildStep "Route/Ingress Cleanup" "cleanupRoutes"
968971

@@ -1039,7 +1042,7 @@ else
10391042
fi
10401043

10411044
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1042-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "routeCleanupComplete" "Route/Ingress Cleanup" "${CLEANUP_WARNINGS}"
1045+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "routeCleanupComplete" "Route/Ingress Cleanup" "${CLEANUP_WARNINGS}"
10431046

10441047
##############################################
10451048
### Report any ingress that have stale or stalled acme challenges, this accordion will only show if there are stale challenges
@@ -1068,7 +1071,7 @@ if [ "${CURRENT_CHALLENGE_ROUTES[@]}" != "" ]; then
10681071
done
10691072

10701073
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1071-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "staleChallengesComplete" "Route/Ingress Certificate Challenges" "true"
1074+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "staleChallengesComplete" "Route/Ingress Certificate Challenges" "true"
10721075
fi
10731076
previousStepEnd=${currentStepEnd}
10741077
beginBuildStep "Update Configmap" "updateConfigmap"
@@ -1230,7 +1233,7 @@ do
12301233
done
12311234

12321235
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1233-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "updateConfigmapComplete" "Update Configmap" "false"
1236+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "updateConfigmapComplete" "Update Configmap" "false"
12341237

12351238
##############################################
12361239
### REDEPLOY DEPLOYMENTS IF CONFIG MAP CHANGES
@@ -1292,7 +1295,7 @@ if [ "$BUILD_TYPE" == "pullrequest" ] || [ "$BUILD_TYPE" == "branch" ]; then
12921295
IMAGE_HASHES[${IMAGE_NAME}]=$(docker inspect ${PUSH_IMAGE} --format '{{json .RepoDigests}}' | "${JQ_QUERY[@]}")
12931296
done
12941297
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1295-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "pushingImagesComplete" "Pushing Images" "false"
1298+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "pushingImagesComplete" "Pushing Images" "false"
12961299

12971300
# All images that should be pulled are copied to the harbor registry
12981301
for IMAGE_NAME in "${!IMAGES_PULL[@]}"
@@ -1320,7 +1323,7 @@ if [ "$BUILD_TYPE" == "pullrequest" ] || [ "$BUILD_TYPE" == "branch" ]; then
13201323
DEPRECATED_IMAGE_SUGGESTION[${IMAGE_NAME}]=$(echo "${SKOPEO_INSPECT}" | jq -r '.Labels."sh.lagoon.image.deprecated.suggested" | sub("docker.io\/";"")? // false')
13211324
fi
13221325
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1323-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "pushingImage${IMAGE_NAME}Complete" "Pushing Pulled Image ${IMAGE_NAME}" "false"
1326+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "pushingImage${IMAGE_NAME}Complete" "Pushing Pulled Image ${IMAGE_NAME}" "false"
13241327
done
13251328

13261329
# pullrequest/branch end
@@ -1337,7 +1340,7 @@ elif [ "$BUILD_TYPE" == "promote" ]; then
13371340

13381341
IMAGE_HASHES[${IMAGE_NAME}]=$(skopeo inspect --retry-times 5 docker://${PUSH_IMAGE} --tls-verify=false | jq ".Name + \"@\" + .Digest" -r)
13391342
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1340-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "pushingImage${IMAGE_NAME}Complete" "Pushing Pulled Promote Image ${IMAGE_NAME}" "false"
1343+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "pushingImage${IMAGE_NAME}Complete" "Pushing Pulled Promote Image ${IMAGE_NAME}" "false"
13411344
done
13421345
# promote end
13431346
fi
@@ -1368,7 +1371,7 @@ if [ "${DEPRECATED_IMAGE_WARNINGS}" == "true" ]; then
13681371
done
13691372

13701373
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1371-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deprecatedImagesComplete" "Deprecated Image Warnings" "true"
1374+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deprecatedImagesComplete" "Deprecated Image Warnings" "true"
13721375
fi
13731376

13741377
previousStepEnd=${currentStepEnd}
@@ -1434,7 +1437,7 @@ else
14341437
fi
14351438

14361439
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1437-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "backupConfigurationComplete" "Backup Configuration" "false"
1440+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "backupConfigurationComplete" "Backup Configuration" "false"
14381441
previousStepEnd=${currentStepEnd}
14391442
beginBuildStep "Pre-Rollout Tasks" "runningPreRolloutTasks"
14401443

@@ -1447,7 +1450,7 @@ if [ "${LAGOON_PREROLLOUT_DISABLED}" != "true" ]; then
14471450
else
14481451
echo "pre-rollout tasks are currently disabled LAGOON_PREROLLOUT_DISABLED is set to true"
14491452
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1450-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "preRolloutsCompleted" "Pre-Rollout Tasks" "false"
1453+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "preRolloutsCompleted" "Pre-Rollout Tasks" "false"
14511454
fi
14521455

14531456
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
@@ -1489,7 +1492,7 @@ mkdir -p $LAGOON_SERVICES_YAML_FOLDER
14891492
build-deploy-tool template lagoon-services --saved-templates-path ${LAGOON_SERVICES_YAML_FOLDER} --images /kubectl-build-deploy/images.yaml
14901493

14911494
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1492-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deploymentTemplatingComplete" "Deployment Templating" "false"
1495+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deploymentTemplatingComplete" "Deployment Templating" "false"
14931496
previousStepEnd=${currentStepEnd}
14941497
beginBuildStep "Applying Deployments" "applyingDeployments"
14951498

@@ -1566,7 +1569,7 @@ do
15661569
done
15671570

15681571
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1569-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deploymentApplyComplete" "Applying Deployments" "false"
1572+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deploymentApplyComplete" "Applying Deployments" "false"
15701573
previousStepEnd=${currentStepEnd}
15711574
beginBuildStep "Cronjob Cleanup" "cleaningUpCronjobs"
15721575

@@ -1599,7 +1602,7 @@ for DC in ${!DELETE_CRONJOBS[@]}; do
15991602
done
16001603

16011604
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1602-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "cronjobCleanupComplete" "Cronjob Cleanup" "false"
1605+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "cronjobCleanupComplete" "Cronjob Cleanup" "false"
16031606
previousStepEnd=${currentStepEnd}
16041607
beginBuildStep "Post-Rollout Tasks" "runningPostRolloutTasks"
16051608

@@ -1613,7 +1616,7 @@ if [ "${LAGOON_POSTROLLOUT_DISABLED}" != "true" ]; then
16131616
else
16141617
echo "post-rollout tasks are currently disabled LAGOON_POSTROLLOUT_DISABLED is set to true"
16151618
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1616-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "postRolloutsCompleted" "Post-Rollout Tasks" "false"
1619+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "postRolloutsCompleted" "Post-Rollout Tasks" "false"
16171620
fi
16181621

16191622
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
@@ -1660,7 +1663,7 @@ for TLS_FALSE_INGRESS in $TLS_FALSE_INGRESSES; do
16601663
done
16611664

16621665
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1663-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deployCompleted" "Build and Deploy" "false"
1666+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deployCompleted" "Build and Deploy" "false"
16641667
previousStepEnd=${currentStepEnd}
16651668

16661669
if [ "$(featureFlag INSIGHTS)" = enabled ]; then
@@ -1686,11 +1689,11 @@ if [ "$(featureFlag INSIGHTS)" = enabled ]; then
16861689
((++BUILD_WARNING_COUNT))
16871690
echo "##############################################"
16881691
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1689-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "insightsWarning" "Insights Gathering" "true"
1692+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "insightsWarning" "Insights Gathering" "true"
16901693
previousStepEnd=${currentStepEnd}
16911694
else
16921695
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1693-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "insightsCompleted" "Insights Gathering" "false"
1696+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "insightsCompleted" "Insights Gathering" "false"
16941697
previousStepEnd=${currentStepEnd}
16951698
fi
16961699

@@ -1699,7 +1702,7 @@ fi
16991702
if [[ "$BUILD_WARNING_COUNT" -gt 0 ]]; then
17001703
beginBuildStep "Completed With Warnings" "deployCompletedWithWarnings"
17011704
echo "This build completed with ${BUILD_WARNING_COUNT} warnings, you should scan the build for warnings and correct them as neccessary"
1702-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deployCompletedWithWarnings" "Completed With Warnings" "true"
1705+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deployCompletedWithWarnings" "Completed With Warnings" "true"
17031706
previousStepEnd=${currentStepEnd}
17041707
# patch the buildpod with the buildstep
17051708
if [ "${SCC_CHECK}" == false ]; then

0 commit comments

Comments
 (0)