Skip to content

Commit a460bbb

Browse files
committed
modify stackhpc workflow to use CI_CLOUD actions variable
1 parent cfc57db commit a460bbb

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.github/workflows/stackhpc.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
pull_request:
99
jobs:
1010
openstack:
11-
name: openstack-ci-arcus # Arcus OpenStack in rcp-cloud-portal-demo project, with RoCE
11+
name: openstack-ci
1212
concurrency: ${{ github.ref }} # to branch/PR
1313
runs-on: ubuntu-20.04
1414
env:
@@ -22,13 +22,15 @@ jobs:
2222
run: |
2323
set -x
2424
mkdir ~/.ssh
25-
echo "${arcus_SSH_KEY}" > ~/.ssh/id_rsa
25+
echo "${BASTION_SSH_KEY}" > ~/.ssh/id_rsa
2626
chmod 0600 ~/.ssh/id_rsa
2727
env:
28-
arcus_SSH_KEY: ${{ secrets.ARCUS_SSH_KEY }}
28+
ARCUS_SSH_KEY: ${{ secrets.ARCUS_SSH_KEY }}
29+
SMS_SSH_KEY: ${{ secrets.SMS_SSH_KEY }}
30+
BASTION_SSH_KEY: ${{ env.CI_CLOUD }}_SSH_KEY
2931

3032
- name: Add bastion's ssh key to known_hosts
31-
run: cat environments/.stackhpc/bastion_fingerprint >> ~/.ssh/known_hosts
33+
run: cat environments/.stackhpc/${{ env.CI_CLOUD}}_bastion_fingerprint >> ~/.ssh/known_hosts
3234
shell: bash
3335

3436
- name: Install ansible etc
@@ -44,17 +46,20 @@ jobs:
4446
- name: Write clouds.yaml
4547
run: |
4648
mkdir -p ~/.config/openstack/
47-
echo "${arcus_CLOUDS_YAML}" > ~/.config/openstack/clouds.yaml
49+
echo "${CLOUDS_YAML}" > ~/.config/openstack/clouds.yaml
4850
shell: bash
4951
env:
50-
arcus_CLOUDS_YAML: ${{ secrets.ARCUS_CLOUDS_YAML }}
52+
ARCUS_CLOUDS_YAML: ${{ secrets.ARCUS_CLOUDS_YAML }}
53+
SMS_CLOUDS_YAML: ${{ secrets.SMS_CLOUDS_YAML }}
54+
CLOUDS_YAML: ${{ env.CI_CLOUD }}_CLOUDS_YAML }}
5155

5256
- name: Setup environment-specific inventory/terraform inputs
5357
run: |
5458
. venv/bin/activate
5559
. environments/.stackhpc/activate
5660
ansible-playbook ansible/adhoc/generate-passwords.yml
5761
echo vault_testuser_password: "$TESTUSER_PASSWORD" > $APPLIANCES_ENVIRONMENT_ROOT/inventory/group_vars/all/test_user.yml
62+
TODO: move TF vars to correct place
5863
env:
5964
TESTUSER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }}
6065

0 commit comments

Comments
 (0)