Skip to content

Commit 18b383d

Browse files
committed
Fix CI
- Switched Microstack functional tests to Ubuntu 22.04 - Added ESI testing to MicroStack.
1 parent 4e8e6c7 commit 18b383d

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

.github/workflows/test-py38-functional-devstack.yaml renamed to .github/workflows/test-functional-devstack.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: test-py38-functional-devstack
1+
name: test-functional-devstack
22

33
on:
44
push:
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-24.04
1212

1313
steps:
1414
- uses: actions/checkout@v4

.github/workflows/test-py39-functional.yaml renamed to .github/workflows/test-py310-functional-openstack.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: test-py39-functional
1+
name: test-py310-functional-openstack
22

33
on:
44
push:
@@ -8,15 +8,15 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-22.04
1212

1313
steps:
1414
- uses: actions/checkout@v4
1515

16-
- name: Set up Python 3.9
16+
- name: Set up Python 3.10
1717
uses: actions/setup-python@v5
1818
with:
19-
python-version: 3.9
19+
python-version: "3.10"
2020

2121
- name: Install ColdFront and plugin
2222
run: |
@@ -41,7 +41,11 @@ jobs:
4141
microstack.openstack application credential create "$CREDENTIAL_NAME" -f value -c secret)
4242
export OPENSTACK_DEVSTACK_APPLICATION_CREDENTIAL_ID=$(
4343
microstack.openstack application credential show "$CREDENTIAL_NAME" -f value -c id)
44+
export OPENSTACK_ESI_APPLICATION_CREDENTIAL_SECRET=$OPENSTACK_DEVSTACK_APPLICATION_CREDENTIAL_SECRET
45+
export OPENSTACK_ESI_APPLICATION_CREDENTIAL_ID=$OPENSTACK_DEVSTACK_APPLICATION_CREDENTIAL_ID
46+
4447
export OPENSTACK_PUBLIC_NETWORK_ID=$(microstack.openstack network show external -f value -c id)
4548
export OS_AUTH_URL="https://localhost:5000"
4649
4750
coldfront test coldfront_plugin_cloud.tests.functional.openstack
51+
coldfront test coldfront_plugin_cloud.tests.functional.esi

ci/devstack.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ cat cert.pem key.pem > devstack-cert.pem
2020
sudo cp devstack-cert.pem /usr/local/share/ca-certificates/devstack-cert.crt
2121
sudo update-ca-certificates
2222

23+
add-apt-repository --list
24+
2325
# Install and start Devstack
2426
git clone https://github.com/openstack/devstack.git /opt/stack/devstack
2527
cd /opt/stack/devstack
26-
git checkout "stable/2023.1"
2728

2829
cp samples/local.conf .
2930

0 commit comments

Comments
 (0)