Merge pull request #1172 from mesosphere/dlipovetsky/backport-1096-re…

…lease-2.5 [release-2.5] ci: Use activation key and org ID instead of username and password
mesosphere · Sep 12, 2024 · 6e46531 · 6e46531
2 parents 9068fb5 + 6c00573
commit 6e46531
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 4 deletions.
diff --git a/.github/workflows/aws-e2e.yaml b/.github/workflows/aws-e2e.yaml
@@ -141,8 +141,8 @@ jobs:
           args: runE2e "${{ matrix.os }}" "${{ matrix.buildConfig }}" aws true
         env:
           GITHUB_TOKEN: ${{ secrets.MESOSPHERECI_USER_TOKEN }}
-          RHSM_USER: ${{ secrets.RHSM_USER }}
-          RHSM_PASS: ${{ secrets.RHSM_PASS }}
+          RHSM_ACTIVATION_KEY: ${{ secrets.RHSM_ACTIVATION_KEY }}
+          RHSM_ORG_ID: ${{ secrets.RHSM_ORG_ID }}
 
       - name: Run make destroy to clean up failed tests
         if: ${{ always() }}

diff --git a/.github/workflows/release-ami.yaml b/.github/workflows/release-ami.yaml
@@ -88,3 +88,5 @@ jobs:
           args: runE2e "${{ matrix.os }}" "${{ matrix.buildConfig }}" aws false
         env:
           GITHUB_TOKEN: ${{ secrets.MESOSPHERECI_USER_TOKEN }}
+          RHSM_ACTIVATION_KEY: ${{ secrets.RHSM_ACTIVATION_KEY }}
+          RHSM_ORG_ID: ${{ secrets.RHSM_ORG_ID }}
diff --git a/.github/workflows/release-vsphere-template.yaml b/.github/workflows/release-vsphere-template.yaml
@@ -79,6 +79,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.MESOSPHERECI_USER_TOKEN }}
           VSPHERE_SERVER: ${{ secrets.VSPHERE_SERVER }}
           VSPHERE_DATASTORE: ${{ secrets.VSPHERE_DATASTORE }}
+          RHSM_ACTIVATION_KEY: ${{ secrets.RHSM_ACTIVATION_KEY }}
+          RHSM_ORG_ID: ${{ secrets.RHSM_ORG_ID }}
 
       - name: Run make destroy to clean up failed tests
         if: ${{ always() }}

diff --git a/.github/workflows/vsphere-e2e.yaml b/.github/workflows/vsphere-e2e.yaml
@@ -88,7 +88,9 @@ jobs:
           VSPHERE_SERVER: ${{ secrets.VSPHERE_SERVER }}
           VSPHERE_DATASTORE: ${{ secrets.VSPHERE_DATASTORE }}
           VSPHERE_DATACENTER: ${{ secrets.VSPHERE_DATACENTER }}
-
+          RHSM_ACTIVATION_KEY: ${{ secrets.RHSM_ACTIVATION_KEY }}
+          RHSM_ORG_ID: ${{ secrets.RHSM_ORG_ID }}
+
       - name: Run make destroy to clean up failed tests
         if: ${{ always() }}
         run: make infra.vsphere.destroy || true

diff --git a/Makefile b/Makefile
@@ -74,7 +74,9 @@ export DOCKER_DEVKIT_VSPHERE_ARGS ?= \
 	--env VSPHERE_USERNAME \
 	--env VSPHERE_PASSWORD \
 	--env RHSM_USER \
-	--env RHSM_PASS
+	--env RHSM_PASS \
+	--env RHSM_ACTIVATION_KEY \
+	--env RHSM_ORG_ID
 
 export DOCKER_DEVKIT_BASTION_ARGS ?= \
 	--env SSH_BASTION_USERNAME \

diff --git a/docs/dev/vsphere.md b/docs/dev/vsphere.md
@@ -26,11 +26,20 @@ VSPHERE_PASSWORD=example_password
 
 **Environment Variables for RedHat subscription:**
 
+For username and password:
+
 ```bash
 RHSM_USER=example_user
 RHSM_PASS=example_password
 ```
 
+Or activation key and org ID:
+
+```bash
+RHSM_ACTIVATION_KEY=example_key
+RHSM_ORG_ID=example_org_id
+```
+
 **Packer variables for vSphere:**
 Following variables are needed for the vSphere. Add this configuration in the `image.yaml`