From b23e6d2ca4ca45bdb5817462201023ddf9938193 Mon Sep 17 00:00:00 2001 From: Mads Hartmann Date: Fri, 17 Jun 2022 12:53:58 +0000 Subject: [PATCH 1/2] Add preview.k3s_successfully_created --- .werft/jobs/build/deploy-to-preview-environment.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.werft/jobs/build/deploy-to-preview-environment.ts b/.werft/jobs/build/deploy-to-preview-environment.ts index c51b2421f02c58..0e2f97a0c1b54b 100644 --- a/.werft/jobs/build/deploy-to-preview-environment.ts +++ b/.werft/jobs/build/deploy-to-preview-environment.ts @@ -105,6 +105,10 @@ export async function deployToPreviewEnvironment(werft: Werft, jobConfig: JobCon exec(`kubectl --kubeconfig ${CORE_DEV_KUBECONFIG_PATH} get secret ${withVM ? 'preview-envs-authproviders-harvester' : 'preview-envs-authproviders'} --namespace=keys -o jsonpath="{.data.authProviders}" > auth-provider-secret.yml`, { silent: true }) if (withVM) { + // We set it to false as default and only set it to true once the k3s cluster is ready. + // We only set the attribute for jobs where a VM is expected. + werft.rootSpan.setAttributes({'preview.k3s_successfully_created': false}) + werft.phase(phases.VM, "Ensuring VM is ready for deployment"); werft.log(vmSlices.VM_READINESS, 'Wait for VM readiness') @@ -122,6 +126,7 @@ export async function deployToPreviewEnvironment(werft: Werft, jobConfig: JobCon werft.log(vmSlices.WAIT_K3S, 'Wait for k3s') await waitForApiserver(PREVIEW_K3S_KUBECONFIG_PATH, { slice: vmSlices.WAIT_K3S }) await waitUntilAllPodsAreReady("kube-system", PREVIEW_K3S_KUBECONFIG_PATH, { slice: vmSlices.WAIT_K3S }) + werft.rootSpan.setAttributes({'preview.k3s_successfully_created': true}) werft.done(vmSlices.WAIT_K3S) werft.log(vmSlices.WAIT_CERTMANAGER, 'Wait for Cert-Manager') From 1d5eb6d391814693daf08d266255fbd80d3e0880 Mon Sep 17 00:00:00 2001 From: Mads Hartmann Date: Fri, 17 Jun 2022 13:06:19 +0000 Subject: [PATCH 2/2] Add preview.gitpod_built_successfully --- .werft/jobs/build/build-and-publish.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.werft/jobs/build/build-and-publish.ts b/.werft/jobs/build/build-and-publish.ts index 1fe795f864ff77..a70347b9e04434 100644 --- a/.werft/jobs/build/build-and-publish.ts +++ b/.werft/jobs/build/build-and-publish.ts @@ -16,7 +16,6 @@ export async function buildAndPublish(werft: Werft, jobConfig: JobConfig) { const { publishRelease, dontTest, - withContrib, retag, version, localAppVersion, @@ -27,6 +26,9 @@ export async function buildAndPublish(werft: Werft, jobConfig: JobConfig) { const releaseBranch = jobConfig.repository.ref; + // We set it to false as default and only set it true if the build succeeds. + werft.rootSpan.setAttributes({ "preview.gitpod_built_successfully": false }); + werft.phase("build", "build running"); const imageRepo = publishRelease ? "gcr.io/gitpod-io/self-hosted" : "eu.gcr.io/gitpod-core-dev/build"; @@ -94,6 +96,8 @@ export async function buildAndPublish(werft: Werft, jobConfig: JobConfig) { if (jobConfig.publishToKots) { publishKots(werft, jobConfig); } + + werft.rootSpan.setAttributes({ "preview.gitpod_built_successfully": true }); } /**