Skip to content
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

Jump to bottom

[release-2.5] ci: Use activation key and org ID instead of username and password #1172

Merged
merged 1 commit into from
Sep 12, 2024
Merged

[release-2.5] ci: Use activation key and org ID instead of username and password #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/aws-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release-ami.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 2 additions & 0 deletions .github/workflows/release-vsphere-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/vsphere-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
9 changes: 9 additions & 0 deletions docs/dev/vsphere.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
Loading