Skip to content

Fix CI #192

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

Merged
knikolla merged 1 commit into from
Feb 7, 2025
Merged

Fix CI #192

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
26 changes: 0 additions & 26 deletions .github/workflows/test-py38-functional-devstack.yaml
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions .github/workflows/test-py39-functional.yaml → ...lows/test-py39-functional-microstack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: test-py39-functional
name: test-py39-functional-microstack

on:
push:
Expand All @@ -8,7 +8,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -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
16 changes: 0 additions & 16 deletions ci/devstack-mapping.json
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions ci/devstack-test-oidc.py
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions ci/devstack.sh
View file
Open in desktop

This file was deleted.

15 changes: 5 additions & 10 deletions ci/run_functional_tests_openstack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down