From 1a7698f9d3eaafd2600f2047a6ed10cc4a7885fc Mon Sep 17 00:00:00 2001 From: Moritz Clasmeier Date: Mon, 2 Nov 2026 08:35:25 +0100 Subject: [PATCH 1/2] Spawn login sub-shells by default --- cmd/subshell.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/subshell.go b/cmd/subshell.go index 1eaa738..7652468 100644 --- a/cmd/subshell.go +++ b/cmd/subshell.go @@ -50,7 +50,7 @@ func runCommandOrSubshell(roxieConfig deployer.RoxieConfig, centralDeploymentInf shellPath := resolveShellPath() log.Infof("Spawning sub-shell: %s", shellPath) printBanner(centralDeploymentInfo) - cmd = exec.Command(shellPath, "-i") + cmd = exec.Command(shellPath, "-l", "-i") } else { // args is non-empty. cmd = exec.Command(args[0], args[1:]...) From b66011d548788a1e2c96748e02a4432bbcc5a2cd Mon Sep 17 00:00:00 2001 From: Moritz Clasmeier Date: Mon, 2 Nov 2026 10:21:20 +0100 Subject: [PATCH 2/2] Fix gke provisioning --- .github/workflows/e2e-tests.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index cc69033..4a08664 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -62,6 +62,7 @@ jobs: - name: Authenticate to GCloud + id: gcp-auth if: inputs.cluster-type == 'gke' uses: google-github-actions/auth@v3 with: @@ -73,9 +74,20 @@ jobs: with: install_components: "gke-gcloud-auth-plugin" - - name: Configure GKE auth plugin - if: inputs.cluster-type == 'gke' - run: echo "USE_GKE_GCLOUD_AUTH_PLUGIN=True" >> "$GITHUB_ENV" + - name: Use stored gcloud credentials + if: steps.gcp-auth.outcome == 'success' + env: + GCP_CREDENTIALS_JSON: ${{ secrets.ROXIE_CI_AUTOMATION_GCP_SA }} + run: | + echo "USE_GKE_GCLOUD_AUTH_PLUGIN=True" >> "$GITHUB_ENV" + expected_account="$(jq -er '.client_email' <<< "$GCP_CREDENTIALS_JSON")" + if [[ "$(gcloud config get-value core/account)" != "$expected_account" ]]; then + echo "::error::gcloud's active account does not match the CI service account" + exit 1 + fi + # setup-gcloud already stored these credentials. Avoid the file-override crash: + # https://github.com/google-github-actions/auth/issues/535 + echo "CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=" >> "$GITHUB_ENV" - name: Download production infractl uses: stackrox/actions/infra/install-infractl@v1.0.48