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

CI Fixes and others #111

Merged
merged 7 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion .docker/docker-compose.gh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
- "POSTGRES_HOST_AUTH_METHOD=md5"

mssql:
image: mcr.microsoft.com/mssql/server:2019-CU11-ubuntu-20.04
image: mcr.microsoft.com/mssql/server:2019-CU28-ubuntu-20.04
environment:
ACCEPT_EULA: Y
SA_PASSWORD: <YourStrong!Passw0rd>
Expand Down
12 changes: 7 additions & 5 deletions tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,24 @@ Run all test starting with ``test_array_`
These are dirty notes for the quickest way to test mssql queries manually in the way the tests work.

1. Create a new dir. E.g. `.local_docker_test`
2. Copy the original docker-compose file from directory `.docker` and remove everything except the qgis and the mssql container.
3. Copy the original Dockerfile as well. Leave it like it is...
2. Copy the original docker-compose file from directory `.docker` and remove everything except the qgis and the mssql container (remove the postgis dependency in qgis as well).
4. Copy the original `run-docker-tests.sh` and remove everything except:
signedav marked this conversation as resolved.
Show resolved Hide resolved
```bash
set -e

/usr/src/tests/testdata/mssql/setup-mssql.sh
```
5. Do the following:
Go to the local folder
```bash
docker-compose up -d
docker exec -it local_docker_tests_qgis_1 bash
export QGIS_TEST_VERSION=latest
export GITHUB_WORKSPACE=$PWD
docker-compose -f .local_docker_test/docker-compose.gh.yml up -d
docker exec -it local_docker_test_qgis_1 bash
```
And then in the qgis docker:
```bash
/usr/src/.local_docker_tests/run-docker-tests.sh;
/usr/src/.local_docker_test/run-docker-tests.sh
java -jar /usr/src/modelbaker/iliwrapper/bin/ili2mssql-5.0.0/ili2mssql-5.0.0.jar --schemaimport --dbhost mssql --dbusr sa --dbpwd '<YourStrong!Passw0rd>' --dbdatabase gis --dbschema optimal_polymorph_manuel --coalesceCatalogueRef --createEnumTabs --createNumChecks --createUnique --createFk --createFkIdx --coalesceMultiSurface --coalesceMultiLine --coalesceMultiPoint --coalesceArray --beautifyEnumDispName --createGeomIdx --createMetaInfo --expandMultilingual --createTypeConstraint --createEnumTabsWithId --createTidCol --importTid --smart2Inheritance --strokeArcs --createBasketCol --defaultSrsAuth EPSG --defaultSrsCode 2056 --preScript NULL --postScript NULL --models Polymorphic_Ortsplanung_V1_1 --iliMetaAttrs NULL /usr/src/tests/testdata/ilimodels/Polymorphic_Ortsplanung_V1_1.ili
```
(Surely this could be done without this qgis container, but there you have everything for the set up already...)
Expand Down
Loading