diff --git a/.github/workflows/e2e-test-release.yml b/.github/workflows/e2e-test-release.yml index 136d647586..6fe4c33f41 100644 --- a/.github/workflows/e2e-test-release.yml +++ b/.github/workflows/e2e-test-release.yml @@ -176,6 +176,23 @@ jobs: kubernetes-version: "v1.28" runner: "ubuntu-22.04" + # internal-lb tests (at least one test on each supported provider) + - test: "sonobuoy quick" + refStream: "ref/main/stream/debug/?" + provider: "gcp" + kubernetes-version: "v1.28" + internal-lb: "true" + - test: "lb" + refStream: "ref/main/stream/debug/?" + provider: "azure" + kubernetes-version: "v1.28" + internal-lb: "true" + - test: "recover" + refStream: "ref/main/stream/debug/?" + provider: "aws" + kubernetes-version: "v1.28" + internal-lb: "true" + # # Tests on macOS runner # @@ -232,7 +249,7 @@ jobs: gcpInClusterServiceAccountKey: ${{ secrets.GCP_CLUSTER_SERVICE_ACCOUNT }} test: ${{ matrix.test }} buildBuddyApiKey: ${{ secrets.BUILDBUDDY_ORG_API_KEY }} - azureClusterCreateCredentials: ${{ secrets.AZURE_E2E_CLUSTER_CREDENTIALS }} + azureClusterCreateCredentials: ${{ matrix.internal-lb == 'true' && secrets.AZURE_E2E_INTERNAL_LB_CREDENTIALS || secrets.AZURE_E2E_CLUSTER_CREDENTIALS }} azureIAMCreateCredentials: ${{ secrets.AZURE_E2E_IAM_CREDENTIALS }} registry: ghcr.io cosignPassword: ${{ secrets.COSIGN_PASSWORD }} @@ -241,6 +258,7 @@ jobs: selfManagedInfra: ${{ matrix.selfManagedInfra == 'true' }} s3AccessKey: ${{ secrets.AWS_ACCESS_KEY_ID_S3PROXY }} s3SecretKey: ${{ secrets.AWS_SECRET_ACCESS_KEY_S3PROXY }} + internalLoadBalancer: ${{ matrix.internal-lb == 'true' }} - name: Always terminate cluster if: always() diff --git a/.github/workflows/e2e-test-weekly.yml b/.github/workflows/e2e-test-weekly.yml index 773ed3e760..e379fe6a2e 100644 --- a/.github/workflows/e2e-test-weekly.yml +++ b/.github/workflows/e2e-test-weekly.yml @@ -195,6 +195,26 @@ jobs: refStream: "ref/main/stream/debug/?" provider: "gcp" kubernetes-version: "v1.28" + internal-lb: false + + # internal-lb tests (at least one test on each supported provider) + - test: "sonobuoy quick" + refStream: "ref/main/stream/debug/?" + provider: "gcp" + kubernetes-version: "v1.28" + internal-lb: "true" + - test: "lb" + refStream: "ref/main/stream/debug/?" + provider: "azure" + kubernetes-version: "v1.28" + internal-lb: "true" + - test: "recover" + refStream: "ref/main/stream/debug/?" + provider: "aws" + kubernetes-version: "v1.28" + internal-lb: "true" + + # # Tests on release-stable refStream @@ -205,14 +225,17 @@ jobs: refStream: "ref/release/stream/stable/?" provider: "gcp" kubernetes-version: "v1.27" + internal-lb: false - test: "verify" refStream: "ref/release/stream/stable/?" provider: "azure" kubernetes-version: "v1.27" + internal-lb: false - test: "verify" refStream: "ref/release/stream/stable/?" provider: "aws" kubernetes-version: "v1.27" + internal-lb: false runs-on: ubuntu-22.04 permissions: @@ -249,7 +272,7 @@ jobs: gcpInClusterServiceAccountKey: ${{ secrets.GCP_CLUSTER_SERVICE_ACCOUNT }} test: ${{ matrix.test }} buildBuddyApiKey: ${{ secrets.BUILDBUDDY_ORG_API_KEY }} - azureClusterCreateCredentials: ${{ secrets.AZURE_E2E_CLUSTER_CREDENTIALS }} + azureClusterCreateCredentials: ${{ matrix.internal-lb == 'true' && secrets.AZURE_E2E_INTERNAL_LB_CREDENTIALS || secrets.AZURE_E2E_CLUSTER_CREDENTIALS }} azureIAMCreateCredentials: ${{ secrets.AZURE_E2E_IAM_CREDENTIALS }} registry: ghcr.io githubToken: ${{ secrets.GITHUB_TOKEN }} @@ -260,6 +283,7 @@ jobs: selfManagedInfra: ${{ matrix.selfManagedInfra == 'true' }} s3AccessKey: ${{ secrets.AWS_ACCESS_KEY_ID_S3PROXY }} s3SecretKey: ${{ secrets.AWS_SECRET_ACCESS_KEY_S3PROXY }} + internalLoadBalancer: ${{ matrix.internal-lb == 'true' }} - name: Always terminate cluster if: always() diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index bff823518f..0b219e88b9 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -228,7 +228,7 @@ jobs: cliVersion: ${{ inputs.cliVersion }} isDebugImage: ${{ needs.find-latest-image.outputs.isDebugImage }} buildBuddyApiKey: ${{ secrets.BUILDBUDDY_ORG_API_KEY }} - azureClusterCreateCredentials: ${{ secrets.AZURE_E2E_CLUSTER_CREDENTIALS }} + azureClusterCreateCredentials: ${{ inputs.internalLoadBalancer && secrets.AZURE_E2E_INTERNAL_LB_CREDENTIALS || secrets.AZURE_E2E_CLUSTER_CREDENTIALS }} azureIAMCreateCredentials: ${{ secrets.AZURE_E2E_IAM_CREDENTIALS }} registry: ghcr.io githubToken: ${{ secrets.GITHUB_TOKEN }}