Fix CI

- Switched Microstack functional tests to Ubuntu 22.04 - Added ESI testing to MicroStack. - Removed Devstack testing workflow. This is now redundant since we are not using Swift anymore in production but just RGW, and the ESI tests were switched to the Microstack job. - Removed unused scripts in ci/
nerc-project · Feb 6, 2025 · 103277a · 103277a
1 parent 4e8e6c7
commit 103277a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 142 deletions.
diff --git a/.github/workflows/test-py38-functional-devstack.yaml b/.github/workflows/test-py38-functional-devstack.yaml
diff --git a/.github/workflows/test-py39-functional.yaml → ...lows/test-py39-functional-microstack.yaml b/.github/workflows/test-py39-functional.yaml → ...lows/test-py39-functional-microstack.yaml
@@ -1,4 +1,4 @@
-name: test-py39-functional
+name: test-py39-functional-microstack
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
@@ -41,7 +41,11 @@ jobs:
               microstack.openstack application credential create "$CREDENTIAL_NAME" -f value -c secret)
           export OPENSTACK_DEVSTACK_APPLICATION_CREDENTIAL_ID=$(
               microstack.openstack application credential show "$CREDENTIAL_NAME" -f value -c id)
+          export OPENSTACK_ESI_APPLICATION_CREDENTIAL_SECRET=$OPENSTACK_DEVSTACK_APPLICATION_CREDENTIAL_SECRET
+          export OPENSTACK_ESI_APPLICATION_CREDENTIAL_ID=$OPENSTACK_DEVSTACK_APPLICATION_CREDENTIAL_ID
+
           export OPENSTACK_PUBLIC_NETWORK_ID=$(microstack.openstack network show external -f value -c id)
           export OS_AUTH_URL="https://localhost:5000"
 
           coldfront test coldfront_plugin_cloud.tests.functional.openstack
+          coldfront test coldfront_plugin_cloud.tests.functional.esi
diff --git a/ci/devstack-mapping.json b/ci/devstack-mapping.json
diff --git a/ci/devstack-test-oidc.py b/ci/devstack-test-oidc.py
diff --git a/ci/devstack.sh b/ci/devstack.sh
diff --git a/ci/run_functional_tests_openstack.sh b/ci/run_functional_tests_openstack.sh
@@ -5,32 +5,27 @@
 # Tests expect the resource to be name Devstack
 set -xe
 REPO_PATH=$PWD
-source $REPO_PATH/ci/devstack-config-ip.sh 
-source /opt/stack/devstack/openrc admin admin
+source $REPO_PATH/ci/devstack-config-ip.sh
 
 credential_name=$(openssl rand -base64 12)
 
 export OPENSTACK_DEVSTACK_APPLICATION_CREDENTIAL_SECRET=$(
-    openstack application credential create "$credential_name" -f value -c secret)
+  microstack.openstack application credential create "$credential_name" -f value -c secret)
 export OPENSTACK_DEVSTACK_APPLICATION_CREDENTIAL_ID=$(
-    openstack application credential show "$credential_name" -f value -c id)
+  microstack.openstack application credential show "$credential_name" -f value -c id)
 
 export OPENSTACK_ESI_APPLICATION_CREDENTIAL_SECRET=$OPENSTACK_DEVSTACK_APPLICATION_CREDENTIAL_SECRET
 export OPENSTACK_ESI_APPLICATION_CREDENTIAL_ID=$OPENSTACK_DEVSTACK_APPLICATION_CREDENTIAL_ID
 
-export OPENSTACK_PUBLIC_NETWORK_ID=$(openstack network show public -f value -c id)
+export OPENSTACK_PUBLIC_NETWORK_ID=$(microstack.openstack network show external -f value -c id)
 
 if [[ ! "${CI}" == "true" ]]; then
     source /tmp/coldfront_venv/bin/activate
 fi
 
 export DJANGO_SETTINGS_MODULE="local_settings"
 export FUNCTIONAL_TESTS="True"
-export OS_AUTH_URL="http://$HOST_IP/identity"
-export KEYCLOAK_URL="http://$HOST_IP:8080"
-export KEYCLOAK_USER="admin"
-export KEYCLOAK_PASS="nomoresecret"
-export KEYCLOAK_REALM="master"
+export OS_AUTH_URL="http://localhost:5000"
 
 coverage run --source="." -m django test coldfront_plugin_cloud.tests.functional.openstack
 coverage run --source="." -m django test coldfront_plugin_cloud.tests.functional.esi