You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
ci: fix merge-conflict regressions from main pickup (runner labels, ui.bzl, fork cockpit)
The merge of main into ae-followup-auth (0c65751) silently took the
upstream version on a swath of files where the fork had previously
deviated. This commit reverts the merge's regressions back to the
fork-correct state (origin/ae-prod) AND completes the runner-label
sweep so every release/mirror/perf workflow uses the same -vm-16cpu
label the fork's runner pool actually has.
1. Runner labels — main re-introduced 'oracle-16cpu-64gb-x86-64' and
'oracle-8cpu-32gb-x86-64' on 7 workflows. Fork's pool only resolves
'oracle-vm-16cpu-64gb-x86-64'; both stale labels sit queued forever.
Fixed: cli_release.yaml (L18+L212), cloud_release.yaml (L18),
mirror_demos.yaml (L12), mirror_deps.yaml (L12),
mirror_releases.yaml (L13), operator_release.yaml (L18+L143),
perf_common.yaml (L37+L60). vizier_release.yaml L18 was fixed
already in 0fd9c3f.
2. bazel/ui.bzl — main reverted PR #64's webpack-build fixes that
broke release/cloud/v0.0.10 with 'export: `18': not a valid
identifier'. Restored: 'set -x' for action-shell tracing, PATH
that puts /opt/px_dev/tools/node/bin FIRST, 'hash -r', the
STABLE_BUILD_TAG|BUILD_TIMESTAMP allowlist sed (vs the wildcard
that word-splits FORMATTED_DATE), and use_default_shell_env=True
so --incompatible_strict_action_env doesn't strip yarn from PATH.
3. 28 fork-cloud config files — main's PR pixie-io#2391 (cert-manager
migration) deleted private/cockpit/*,
terraform/kubernetes/auth0/*, terraform/kubernetes/cloud_deps/*,
.sops.yaml, private/skaffold_cloud.yaml. These are still load-
bearing for the AOCC pixie-cloud deployment; the fork hasn't
migrated to cert-manager-compatible secrets yet (PR pixie-io#2391's
monitor.go fallback path is in place, so adoption is the
follow-up, not a blocker). Restored all 28 from origin/ae-prod.
Genuine main pickups that were CORRECT to keep (no fix needed): the
src/utils/shared/k8s/{apply,delete}.go import-order +
sets.New[string] generics migration,
src/operator/controllers/monitor.go's cert-manager secret fallback,
and the src/carnot/BUILD.bazel + src/carnot/exec/BUILD.bazel
additions.
0 commit comments