Skip to content

OTA-740: Fix telemetry shellcheck #44591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-ci merged 2 commits into from
Oct 19, 2023
+15 −3
Merged

OTA-740: Fix telemetry shellcheck #44591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be53f06
ci-operator/step-registry/ipi/conf/telemetry: Disable by default (again)
wking Oct 18, 2023
f7102a7
Make 4.11 regex pass shellcheck
jupierce Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ci-operator/step-registry/ipi/conf/telemetry/ipi-conf-telemetry-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ set -o nounset
set -o errexit
set -o pipefail

if test -z "${TELEMETRY_ENABLED}"
then
if [[ "${JOB_NAME}" =~ (^|[^[:digit:]]+)4.11([^[:digit:]]+|$) ]]
Copy link
Copy Markdown
Member

@stbenjam stbenjam Oct 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok having this off on 4.12 minors and multi-upgrades too?

Copy link
Copy Markdown
Member

@wking wking Oct 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All relevent versions of the monitoring stack understand:

telemeterClient:
  enabled: false

The issue is whether the origin suite understands that means Telemetry has been disabled. And 4.11->4.12 update jobs are controlled by a 4.12 origin suite, so they're fine with Telemetry disabled. The current JOB_NAME matching will disable it for those jobs by default, because they mention 4.11, but 🤷, we don't need to check Telemetry in those runs, and if we decide we do, we can go for a fancier regexp or explicitly set TELEMETRY_ENABLED: "true" for those jobs.

then
TELEMETRY_ENABLED=true
echo "TELEMETRY_ENABLED is empty, defaulting to '${TELEMETRY_ENABLED}' for the 4.11 ${JOB_NAME}"
else
TELEMETRY_ENABLED=false
echo "TELEMETRY_ENABLED is empty, defaulting to '${TELEMETRY_ENABLED}' for the not-4.11 ${JOB_NAME}"
fi
fi

if test true = "${TELEMETRY_ENABLED}"
then
echo "Nothing to do with TELEMETRY_ENABLED='${TELEMETRY_ENABLED}'"
Expand Down
6 changes: 3 additions & 3 deletions ci-operator/step-registry/ipi/conf/telemetry/ipi-conf-telemetry-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ ref:
memory: 100Mi
env:
- name: TELEMETRY_ENABLED
default: "true"
default: ""
documentation: |-
Enable Telemetry:
* "false" - do not enable Telemetry
* "true" (default) - enable Telemetry
* "false" (default for most jobs) - do not enable Telemetry
* "true" (default when JOB_NAME includes 4.11) - enable Telemetry
documentation: |-
The configure telemetry step generates a "${SHARED_DIR}/manifest_cluster-monitoring-config.yaml" manifest, or manipulates the manifest if it already exists, to configure telemeterClient's enabled property.