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.

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

Added parameters to AIO and image build workflows to be reused by external CI #1454

Merged
merged 11 commits into from
Jan 17, 2025
12 changes: 11 additions & 1 deletion .github/workflows/stackhpc-all-in-one.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ on:
description: Whether to perform an upgrade
type: boolean
default: false
stackhpc_cloud_tests_version:
description: Git version of https://github.com/stackhpc/stackhpc-cloud-tests to use for testing
type: string
default: main
repository:
description: SKC repository to checkout (convenience for CI)
type: string
default: ${{ github.repository }}
secrets:
KAYOBE_VAULT_PASSWORD:
required: true
Expand Down Expand Up @@ -94,6 +102,7 @@ jobs:
- name: Checkout ${{ inputs.upgrade && 'previous release' || 'current' }} config
uses: actions/checkout@v4
with:
repository: ${{ inputs.repository }}
ref: ${{ inputs.upgrade && env.PREVIOUS_BRANCH || github.ref }}
wtripp180901 marked this conversation as resolved.
Show resolved Hide resolved
submodules: true

Expand Down Expand Up @@ -367,6 +376,7 @@ jobs:
- name: Checkout current release config
uses: actions/checkout@v4
with:
repository: ${{ inputs.repository }}
submodules: true
clean: false
if: inputs.upgrade
Expand Down Expand Up @@ -448,7 +458,7 @@ jobs:
-v $(pwd)/sot-results:/stack/sot-results \
-e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
$KAYOBE_IMAGE \
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/stackhpc-openstack-tests.yml'
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/stackhpc-openstack-tests.yml' -e sot_version=${{ inputs.stackhpc_cloud_tests_version }}
env:
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}

Expand Down
6 changes: 3 additions & 3 deletions doc/source/contributor/testing-ci-automation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ The workflow performs the following high-level steps:
#. If this is an upgrade job, upgrade the cloud under test to the target
release.
#. Run Tempest and `StackHPC OpenStack Tests
<https://github.com/stackhpc/stackhpc-openstack-tests>`_ to test the cloud.
<https://github.com/stackhpc/stackhpc-cloud-tests>`_ to test the cloud.
#. Collect diagnostic information.
#. Upload results as an artifact.
#. Destroy the VM using Terraform.
Expand Down Expand Up @@ -346,11 +346,11 @@ The workflow performs the following high-level steps:
#. Register test resources in the cloud under test (images, flavors, networks,
subnets, routers, etc.).
#. Run Tempest and `StackHPC OpenStack Tests
<https://github.com/stackhpc/stackhpc-openstack-tests>`__ to test the cloud.
<https://github.com/stackhpc/stackhpc-cloud-tests>`__ to test the cloud.
#. If this is an upgrade job, upgrade the cloud under test to the target
release.
#. Run Tempest and `StackHPC OpenStack Tests
<https://github.com/stackhpc/stackhpc-openstack-tests>`__ to test the cloud.
<https://github.com/stackhpc/stackhpc-cloud-tests>`__ to test the cloud.
#. Collect diagnostic information.
#. Upload results as an artifact.
#. Destroy the VMs using Terraform.
Expand Down
6 changes: 3 additions & 3 deletions etc/kayobe/ansible/stackhpc-openstack-tests.yml
Alex-Welsh marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
- stackhpc-openstack-tests
vars:
sot_venv: "{{ virtualenv_path }}/sot-venv"
sot_repo: https://github.com/stackhpc/stackhpc-openstack-tests
sot_version: v0.0.1
sot_repo: https://github.com/stackhpc/stackhpc-cloud-tests
sot_version: main
sot_timeout: 30
results_path_local: "{{ lookup('env', 'HOME') }}/sot-results"
tasks:
Expand Down Expand Up @@ -66,7 +66,7 @@
{{ sot_venv }}/bin/py.test
--html={{ results_tmpdir.path }}/stackhpc-openstack-tests.html
--self-contained-html
--pyargs stackhpc_openstack_tests
--pyargs stackhpc_cloud_tests
--timeout {{ sot_timeout }}
-vv
environment:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ features:
- |
Adds a new ``stackhpc-openstack-tests.yml`` playbook that executes tests in
the `StackHPC OpenStack Tests
<https://github.com/stackhpc/stackhpc-openstack-tests>`__ repository. Both
<https://github.com/stackhpc/stackhpc-cloud-tests>`__ repository. Both
the playbook and tests are currently experimental, and are currently
targeting only an all-in-one CI use case.
Loading