Skip to content

Commit c05f2d3

Browse files
shreddedbaconshreddedbacon
committed
refactor: adjust function names and add buildimages start delimiter
1 parent 6003592 commit c05f2d3

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
@@ -120,6 +120,7 @@ function internalContainerRegistryCheck() {
120120

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

123+
# begin build step will echo the step start delimeter and then patch kubernetes resource with the value
123124
function beginBuildStep() {
124125
[ "$1" ] || return #Buildstep start
125126
[ "$2" ] || return #buildstep
@@ -135,7 +136,8 @@ function beginBuildStep() {
135136
fi
136137
}
137138

138-
function patchBuildStep() {
139+
# finalize build step will echo the end delimeter only
140+
function finalizeBuildStep() {
139141
[ "$1" ] || return #total start time
140142
[ "$2" ] || return #step start time
141143
[ "$3" ] || return #previous step end time
@@ -220,7 +222,7 @@ fi
220222

221223
set +e
222224
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
223-
patchBuildStep "${buildStartTime}" "${buildStartTime}" "${currentStepEnd}" "${NAMESPACE}" "initialSetup" "Initial Environment Setup" "false"
225+
finalizeBuildStep "${buildStartTime}" "${buildStartTime}" "${currentStepEnd}" "${NAMESPACE}" "initialSetup" "Initial Environment Setup" "false"
224226
previousStepEnd=${currentStepEnd}
225227
beginBuildStep "Docker Compose Validation" "dockerComposeValidation"
226228
DOCKER_COMPOSE_WARNING_COUNT=0
@@ -232,7 +234,7 @@ dccOutput=$(bash -c 'build-deploy-tool validate docker-compose --docker-compose
232234
dccExit=$?
233235
if [ "${dccExit}" != "0" ]; then
234236
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
235-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "dockerComposeValidationError" "Docker Compose Validation" "false"
237+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "dockerComposeValidationError" "Docker Compose Validation" "false"
236238
previousStepEnd=${currentStepEnd}
237239
echo "
238240
##############################################
@@ -319,11 +321,11 @@ if [[ "$DOCKER_COMPOSE_WARNING_COUNT" -gt 0 ]]; then
319321
"
320322
echo "##############################################"
321323
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
322-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "dockerComposeValidationWarning" "Docker Compose Validation" "true"
324+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "dockerComposeValidationWarning" "Docker Compose Validation" "true"
323325
previousStepEnd=${currentStepEnd}
324326
else
325327
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
326-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "dockerComposeValidation" "Docker Compose Validation" "false"
328+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "dockerComposeValidation" "Docker Compose Validation" "false"
327329
previousStepEnd=${currentStepEnd}
328330
fi
329331

@@ -347,7 +349,7 @@ lyvExit=$?
347349

348350
if [ "${lyvExit}" != "0" ]; then
349351
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
350-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "lagoonYmlValidationError" ".lagoon.yml Validation" "false"
352+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "lagoonYmlValidationError" ".lagoon.yml Validation" "false"
351353
previousStepEnd=${currentStepEnd}
352354
echo "
353355
##############################################
@@ -395,7 +397,7 @@ fi
395397
##################
396398

397399
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
398-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "lagoonYmlValidation" ".lagoon.yml Validation" "false"
400+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "lagoonYmlValidation" ".lagoon.yml Validation" "false"
399401
previousStepEnd=${currentStepEnd}
400402
beginBuildStep "Configure Variables" "configuringVariables"
401403
DEPLOY_TYPE=$(cat .lagoon.yml | shyaml get-value environments.${BRANCH//./\\.}.deploy-type default)
@@ -554,7 +556,7 @@ LAGOON_PREROLLOUT_DISABLED=$(apiEnvVarCheck LAGOON_PREROLLOUT_DISABLED "false")
554556
LAGOON_POSTROLLOUT_DISABLED=$(apiEnvVarCheck LAGOON_POSTROLLOUT_DISABLED "false")
555557

556558
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
557-
patchBuildStep "${buildStartTime}" "${buildStartTime}" "${currentStepEnd}" "${NAMESPACE}" "configureVars" "Configure Variables" "false"
559+
finalizeBuildStep "${buildStartTime}" "${buildStartTime}" "${currentStepEnd}" "${NAMESPACE}" "configureVars" "Configure Variables" "false"
558560
previousStepEnd=${currentStepEnd}
559561
beginBuildStep "Container Registry Login" "registryLogin"
560562

@@ -627,8 +629,9 @@ do
627629
done
628630

629631
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
630-
patchBuildStep "${buildStartTime}" "${buildStartTime}" "${currentStepEnd}" "${NAMESPACE}" "registryLogin" "Container Registry Login" "false"
631-
632+
finalizeBuildStep "${buildStartTime}" "${buildStartTime}" "${currentStepEnd}" "${NAMESPACE}" "registryLogin" "Container Registry Login" "false"
633+
previousStepEnd=${currentStepEnd}
634+
beginBuildStep "Image Builds" "buildingImages"
632635

633636
##############################################
634637
### BUILD IMAGES
@@ -679,7 +682,7 @@ if [[ "$BUILD_TYPE" == "pullrequest" || "$BUILD_TYPE" == "branch" ]]; then
679682
fi
680683
else
681684
previousStepEnd=${currentStepEnd}
682-
beginBuildStep "Building Image ${SERVICE_NAME}" "buildingImage${SERVICE_NAME_TITLE}"
685+
beginBuildStep "Building Image ${SERVICE_NAME}" "buildingImage-${SERVICE_NAME_TITLE}"
683686
# otherwise extract build information from the image build data payload
684687
# 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
685688
# built with the name they are meant to be. only 1 build can run at a time within a namespace
@@ -713,7 +716,7 @@ if [[ "$BUILD_TYPE" == "pullrequest" || "$BUILD_TYPE" == "branch" ]]; then
713716
# adding the build image to the list of arguments passed into the next image builds
714717
SERVICE_NAME_UPPERCASE=$(echo "$SERVICE_NAME" | tr '[:lower:]' '[:upper:]')
715718
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
716-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "imageBuild${SERVICE_NAME_TITLE}Complete" "Building Image ${SERVICE_NAME}" "false"
719+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "imageBuild${SERVICE_NAME_TITLE}Complete" "Building Image ${SERVICE_NAME}" "false"
717720
fi
718721
done
719722

@@ -727,7 +730,7 @@ if [[ "$BUILD_TYPE" == "pullrequest" || "$BUILD_TYPE" == "branch" ]]; then
727730
echo "- ${IMAGE_NAME}: ${PULL_IMAGE}"
728731
done
729732
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
730-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "pulledImageInfoComplete" "Pulled Images" "false"
733+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "pulledImageInfoComplete" "Pulled Images" "false"
731734
fi
732735

733736
previousStepEnd=${currentStepEnd}
@@ -750,7 +753,7 @@ if [[ "$BUILD_TYPE" == "pullrequest" || "$BUILD_TYPE" == "branch" ]]; then
750753
done
751754

752755
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
753-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "imageBuildStatsComplete" "Image Build Stats" "false"
756+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "imageBuildStatsComplete" "Image Build Stats" "false"
754757
fi
755758
if [[ "$BUILD_TYPE" == "promote" ]]; then
756759
echo "No images built for promote environments"
@@ -832,7 +835,7 @@ LAGOON_PR_NUMBER=${PR_NUMBER}\n\
832835
fi
833836

834837
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
835-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "serviceConfigurationComplete" "Service Configuration Phase 1" "false"
838+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "serviceConfigurationComplete" "Service Configuration Phase 1" "false"
836839
previousStepEnd=${currentStepEnd}
837840
beginBuildStep "Service Configuration Phase 2" "serviceConfigurationPhase2"
838841

@@ -908,7 +911,7 @@ if [ -n "$(ls -A $LAGOON_DBAAS_YAML_FOLDER/ 2>/dev/null)" ]; then
908911
fi
909912

910913
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
911-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "serviceConfiguration2Complete" "Service Configuration Phase 2" "false"
914+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "serviceConfiguration2Complete" "Service Configuration Phase 2" "false"
912915
previousStepEnd=${currentStepEnd}
913916
beginBuildStep "Route/Ingress Configuration" "configuringRoutes"
914917

@@ -935,7 +938,7 @@ else
935938
fi
936939

937940
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
938-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "configuringRoutesComplete" "Route/Ingress Configuration" "false"
941+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "configuringRoutesComplete" "Route/Ingress Configuration" "false"
939942
previousStepEnd=${currentStepEnd}
940943
beginBuildStep "Route/Ingress Cleanup" "cleanupRoutes"
941944

@@ -1012,7 +1015,7 @@ else
10121015
fi
10131016

10141017
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1015-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "routeCleanupComplete" "Route/Ingress Cleanup" "${CLEANUP_WARNINGS}"
1018+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "routeCleanupComplete" "Route/Ingress Cleanup" "${CLEANUP_WARNINGS}"
10161019

10171020
##############################################
10181021
### Report any ingress that have stale or stalled acme challenges, this accordion will only show if there are stale challenges
@@ -1041,7 +1044,7 @@ if [ "${CURRENT_CHALLENGE_ROUTES[@]}" != "" ]; then
10411044
done
10421045

10431046
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1044-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "staleChallengesComplete" "Route/Ingress Certificate Challenges" "true"
1047+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "staleChallengesComplete" "Route/Ingress Certificate Challenges" "true"
10451048
fi
10461049
previousStepEnd=${currentStepEnd}
10471050
beginBuildStep "Update Configmap" "updateConfigmap"
@@ -1203,7 +1206,7 @@ do
12031206
done
12041207

12051208
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1206-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "updateConfigmapComplete" "Update Configmap" "false"
1209+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "updateConfigmapComplete" "Update Configmap" "false"
12071210

12081211
##############################################
12091212
### REDEPLOY DEPLOYMENTS IF CONFIG MAP CHANGES
@@ -1265,7 +1268,7 @@ if [ "$BUILD_TYPE" == "pullrequest" ] || [ "$BUILD_TYPE" == "branch" ]; then
12651268
IMAGE_HASHES[${IMAGE_NAME}]=$(docker inspect ${PUSH_IMAGE} --format '{{json .RepoDigests}}' | "${JQ_QUERY[@]}")
12661269
done
12671270
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1268-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "pushingImagesComplete" "Pushing Images" "false"
1271+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "pushingImagesComplete" "Pushing Images" "false"
12691272

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

12991302
# pullrequest/branch end
@@ -1310,7 +1313,7 @@ elif [ "$BUILD_TYPE" == "promote" ]; then
13101313

13111314
IMAGE_HASHES[${IMAGE_NAME}]=$(skopeo inspect --retry-times 5 docker://${PUSH_IMAGE} --tls-verify=false | jq ".Name + \"@\" + .Digest" -r)
13121315
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1313-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "pushingImage${IMAGE_NAME}Complete" "Pushing Pulled Promote Image ${IMAGE_NAME}" "false"
1316+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "pushingImage${IMAGE_NAME}Complete" "Pushing Pulled Promote Image ${IMAGE_NAME}" "false"
13141317
done
13151318
# promote end
13161319
fi
@@ -1341,7 +1344,7 @@ if [ "${DEPRECATED_IMAGE_WARNINGS}" == "true" ]; then
13411344
done
13421345

13431346
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1344-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deprecatedImagesComplete" "Deprecated Image Warnings" "true"
1347+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deprecatedImagesComplete" "Deprecated Image Warnings" "true"
13451348
fi
13461349

13471350
previousStepEnd=${currentStepEnd}
@@ -1397,7 +1400,7 @@ else
13971400
fi
13981401

13991402
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1400-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "backupConfigurationComplete" "Backup Configuration" "false"
1403+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "backupConfigurationComplete" "Backup Configuration" "false"
14011404
previousStepEnd=${currentStepEnd}
14021405
beginBuildStep "Pre-Rollout Tasks" "runningPreRolloutTasks"
14031406

@@ -1410,7 +1413,7 @@ if [ "${LAGOON_PREROLLOUT_DISABLED}" != "true" ]; then
14101413
else
14111414
echo "pre-rollout tasks are currently disabled LAGOON_PREROLLOUT_DISABLED is set to true"
14121415
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1413-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "preRolloutsCompleted" "Pre-Rollout Tasks" "false"
1416+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "preRolloutsCompleted" "Pre-Rollout Tasks" "false"
14141417
fi
14151418

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

14541457
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1455-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deploymentTemplatingComplete" "Deployment Templating" "false"
1458+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deploymentTemplatingComplete" "Deployment Templating" "false"
14561459
previousStepEnd=${currentStepEnd}
14571460
beginBuildStep "Applying Deployments" "applyingDeployments"
14581461

@@ -1511,7 +1514,7 @@ do
15111514
done
15121515

15131516
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1514-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deploymentApplyComplete" "Applying Deployments" "false"
1517+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deploymentApplyComplete" "Applying Deployments" "false"
15151518
previousStepEnd=${currentStepEnd}
15161519
beginBuildStep "Cronjob Cleanup" "cleaningUpCronjobs"
15171520

@@ -1544,7 +1547,7 @@ for DC in ${!DELETE_CRONJOBS[@]}; do
15441547
done
15451548

15461549
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1547-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "cronjobCleanupComplete" "Cronjob Cleanup" "false"
1550+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "cronjobCleanupComplete" "Cronjob Cleanup" "false"
15481551
previousStepEnd=${currentStepEnd}
15491552
beginBuildStep "Post-Rollout Tasks" "runningPostRolloutTasks"
15501553

@@ -1558,7 +1561,7 @@ if [ "${LAGOON_POSTROLLOUT_DISABLED}" != "true" ]; then
15581561
else
15591562
echo "post-rollout tasks are currently disabled LAGOON_POSTROLLOUT_DISABLED is set to true"
15601563
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1561-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "postRolloutsCompleted" "Post-Rollout Tasks" "false"
1564+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "postRolloutsCompleted" "Post-Rollout Tasks" "false"
15621565
fi
15631566

15641567
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
@@ -1605,7 +1608,7 @@ for TLS_FALSE_INGRESS in $TLS_FALSE_INGRESSES; do
16051608
done
16061609

16071610
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1608-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deployCompleted" "Build and Deploy" "false"
1611+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deployCompleted" "Build and Deploy" "false"
16091612
previousStepEnd=${currentStepEnd}
16101613

16111614
if [ "$(featureFlag INSIGHTS)" = enabled ]; then
@@ -1631,11 +1634,11 @@ if [ "$(featureFlag INSIGHTS)" = enabled ]; then
16311634
((++BUILD_WARNING_COUNT))
16321635
echo "##############################################"
16331636
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1634-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "insightsWarning" "Insights Gathering" "true"
1637+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "insightsWarning" "Insights Gathering" "true"
16351638
previousStepEnd=${currentStepEnd}
16361639
else
16371640
currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
1638-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "insightsCompleted" "Insights Gathering" "false"
1641+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "insightsCompleted" "Insights Gathering" "false"
16391642
previousStepEnd=${currentStepEnd}
16401643
fi
16411644

@@ -1644,7 +1647,7 @@ fi
16441647
if [[ "$BUILD_WARNING_COUNT" -gt 0 ]]; then
16451648
beginBuildStep "Completed With Warnings" "deployCompletedWithWarnings"
16461649
echo "This build completed with ${BUILD_WARNING_COUNT} warnings, you should scan the build for warnings and correct them as neccessary"
1647-
patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deployCompletedWithWarnings" "Completed With Warnings" "true"
1650+
finalizeBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "deployCompletedWithWarnings" "Completed With Warnings" "true"
16481651
previousStepEnd=${currentStepEnd}
16491652
# patch the buildpod with the buildstep
16501653
if [ "${SCC_CHECK}" == false ]; then

0 commit comments

Comments
 (0)