Skip to content

Commit 31d1cdb

Browse files
pablothedudepablothedude
committed
Update hostnames for tests
Use Devconf settings in the parameters.yml.dist, so devconf will work out-of-the-box for development. Also remove the old StepupDeploy VM parameters.yml. And update the readme to reflect the use of devconf.
1 parent 8ff61d1 commit 31d1cdb

30 files changed

+114
-172
lines changed

‎.github/workflows/run-cypress.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: |
3030
cd docker &&
3131
${DOCKER_COMPOSE} up -d --build &&
32-
docker compose exec -T --user www-data php-fpm.vm.openconext.org bash -c '
32+
docker compose exec -T --user www-data php-fpm.dev.openconext.org bash -c '
3333
SYMFONY_ENV=ci composer install --prefer-dist -n -o --ignore-platform-reqs && \
3434
./app/console cache:clear --env=ci && \
3535
cd theme && CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile && EB_THEME=skeune yarn build
@@ -38,13 +38,13 @@ jobs:
3838
if: always()
3939
run: |
4040
cd docker && \
41-
docker compose exec -T --user www-data php-fpm.vm.openconext.org bash -c '
41+
docker compose exec -T --user www-data php-fpm.dev.openconext.org bash -c '
4242
EB_THEME=skeune ./theme/scripts/prepare-test.js
4343
' && \
4444
docker compose exec -T cypress bash -c '
4545
cd e2e && yarn install && cypress run --spec cypress/integration/skeune/**/*.spec.js,cypress/integration/shared/*.spec.js --browser=chrome --headless
4646
' && \
47-
docker compose exec -T --user www-data php-fpm.vm.openconext.org bash -c '
47+
docker compose exec -T --user www-data php-fpm.dev.openconext.org bash -c '
4848
EB_THEME=openconext ./theme/scripts/prepare-test.js
4949
' && \
5050
docker compose exec -T cypress bash -c '

‎.github/workflows/test-integration.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ jobs:
2929
run: |
3030
cd docker &&
3131
${DOCKER_COMPOSE} up -d --build &&
32-
docker compose exec -T --user www-data php-fpm.vm.openconext.org bash -c '
32+
docker compose exec -T --user www-data php-fpm.dev.openconext.org bash -c '
3333
SYMFONY_ENV=ci composer install --prefer-dist -n -o --ignore-platform-reqs && \
3434
./app/console cache:clear --env=ci && \
3535
cd theme && CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile && EB_THEME=skeune yarn build
3636
'
3737
- name: Run code quality tests
3838
if: always()
3939
run: |
40-
cd docker && docker compose exec -T --user www-data php-fpm.vm.openconext.org bash -c '
40+
cd docker && docker compose exec -T --user www-data php-fpm.dev.openconext.org bash -c '
4141
echo -e "\nPHP Mess Detector\n" && \
4242
./vendor/bin/phpmd src text ci/qa-config/phpmd.xml --exclude */Tests/* && \
4343
echo -e "\nPHP CodeSniffer\n" && \
@@ -52,7 +52,7 @@ jobs:
5252
- name: Run unit tests
5353
if: always()
5454
run: |
55-
cd docker && APP_ENV=ci docker compose exec -T --user www-data php-fpm.vm.openconext.org bash -c '
55+
cd docker && APP_ENV=ci SYMFONY_ENV=ci docker compose exec -T --user www-data php-fpm.dev.openconext.org bash -c '
5656
echo -e "\nInstalling database fixtures...\n" && \
5757
./app/console doctrine:schema:drop --force --env=ci && \
5858
./app/console doctrine:schema:create --env=ci && \
@@ -70,7 +70,7 @@ jobs:
7070
- name: Run acceptance tests
7171
if: always()
7272
run: |
73-
cd docker && docker compose exec -T --user www-data php-fpm.vm.openconext.org bash -c '
73+
cd docker && docker compose exec -T --user www-data php-fpm.dev.openconext.org bash -c '
7474
echo -e "\nInstalling database fixtures...\n" && \
7575
./app/console doctrine:schema:drop --force --env=ci && \
7676
./app/console doctrine:schema:create --env=ci && \
@@ -86,7 +86,7 @@ jobs:
8686
- name: Run linting tests
8787
if: always()
8888
run: |
89-
cd docker && docker compose exec -T --user www-data php-fpm.vm.openconext.org bash -c '
89+
cd docker && docker compose exec -T --user www-data php-fpm.dev.openconext.org bash -c '
9090
echo -e "\nTwig lint\n" && \
9191
app/console lint:twig theme/ && \
9292
cd theme && \
@@ -98,7 +98,7 @@ jobs:
9898
- name: Show log on failure
9999
if: failure()
100100
run: |
101-
cd docker && docker compose exec -T php-fpm.vm.openconext.org cat /opt/openconext/OpenConext-engineblock/app/logs/ci/ci.log
101+
cd docker && docker compose exec -T php-fpm.dev.openconext.org cat /opt/openconext/OpenConext-engineblock/app/logs/ci/ci.log
102102
- name: Send notification on production build nightly build failure
103103
uses: sonots/slack-notice-action@v3
104104
with:

‎app/config/config_ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ doctrine:
1010
driver: pdo_mysql # This must be PDO until all database interaction runs through doctrine
1111
server_version: 5.5
1212
dbname: "%database.dbname%"
13-
host: "db.vm.openconext.org"
13+
host: "db.dev.openconext.org"
1414
port: "%database.port%"
1515
user: "%database.user%"
1616
password: "%database.password%"
1717
engineblock_test:
1818
driver: pdo_mysql # This must be PDO until all database interaction runs through doctrine
1919
server_version: 5.5
2020
dbname: "%database.test.dbname%"
21-
host: "db-test.vm.openconext.org"
21+
host: "db-test.dev.openconext.org"
2222
port: "%database.test.port%"
2323
user: "%database.test.user%"
2424
password: "%database.test.password%"

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"source": "https://github.com/OpenConext/OpenConext-engineblock"
1616
},
1717
"require": {
18-
"php": "7.2",
18+
"php": "~7.2",
1919
"ext-dom": "*",
2020
"ext-json": "*",
2121
"ext-mbstring": "*",

‎docker/docker-compose-php72.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: '2.4'
22

33
services:
4-
php-fpm.vm.openconext.org:
4+
php-fpm.dev.openconext.org:
55
build:
66
dockerfile: docker/php-fpm/Dockerfile-php72

‎docker/docker-compose-php82.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: '2.4'
22

33
services:
4-
php-fpm.vm.openconext.org:
4+
php-fpm.dev.openconext.org:
55
build:
66
dockerfile: docker/php-fpm/Dockerfile-php82

‎docker/docker-compose.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '2.4'
22

33
services:
44

5-
db.vm.openconext.org:
5+
db.dev.openconext.local:
66
image: mariadb:10.2
77
restart: always
88
container_name: eb-db
@@ -19,7 +19,7 @@ services:
1919
timeout: 2s
2020
retries: 20
2121

22-
db-test.vm.openconext.org:
22+
db-test.dev.openconext.local:
2323
image: mariadb:10.2
2424
restart: always
2525
container_name: eb-db-test
@@ -37,32 +37,32 @@ services:
3737
retries: 20
3838
interval: 2s
3939

40-
php-fpm.vm.openconext.org:
40+
php-fpm.dev.openconext.local:
4141
build:
4242
context: ../
4343
# override this in a dedicated dockerfile per php version
4444
# dockerfile: docker/php-fpm/Dockerfile
4545
container_name: eb-phpfpm
4646
volumes:
4747
- ../:/opt/openconext/OpenConext-engineblock
48-
- ../ci/qa-config/files/engine.vm.openconext.org.crt:/etc/apache2/ssl/engine.vm.openconext.org.crt
49-
- ../ci/qa-config/files/engine.vm.openconext.org.key:/etc/apache2/ssl/engine.vm.openconext.org.key
48+
- ../ci/qa-config/files/engine.dev.openconext.local.crt:/etc/apache2/ssl/engine.dev.openconext.local.crt
49+
- ../ci/qa-config/files/engine.dev.openconext.local.key:/etc/apache2/ssl/engine.dev.openconext.local.key
5050
depends_on:
51-
db.vm.openconext.org:
51+
db.dev.openconext.local:
5252
condition: service_healthy
53-
db-test.vm.openconext.org:
53+
db-test.dev.openconext.local:
5454
condition: service_healthy
5555
extra_hosts:
56-
- 'engine.vm.openconext.org: 127.0.0.1'
56+
- 'engine.dev.openconext.local: 127.0.0.1'
5757
environment:
5858
APP_ENV: ci
5959
SYMFONY_ENV: ci
6060
networks:
6161
default:
6262
aliases:
63-
- engine.vm.openconext.org
63+
- engine.dev.openconext.local
6464

65-
selenium.vm.openconext.org:
65+
selenium.dev.openconext.local:
6666
image: selenium/standalone-chrome:2.53.1
6767
container_name: eb-selenium
6868
user: "${UID}:${GID}"
@@ -79,7 +79,7 @@ services:
7979
cypress:
8080
image: "cypress/included:13.1.0"
8181
environment:
82-
- CYPRESS_baseUrl=https://engine.vm.openconext.org
82+
- CYPRESS_baseUrl=https://engine.dev.openconext.local
8383
working_dir: /e2e
8484
entrypoint: cypress open --project .
8585
volumes:

‎docker/nginx/nginx.conf‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎library/EngineBlock/Application/FunctionalTestDiContainer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function getEncryptionKeysConfiguration()
7676
$basePath = $this->container->getParameter('kernel.project_dir');
7777
return [
7878
'default' => [
79-
'publicFile' => '/etc/openconext/engineblock.crt',
79+
'publicFile' => '/config/engine/engineblock.crt',
8080
'privateFile' => $basePath . '/ci/qa-config/files/engineblock.pem',
8181
],
8282
];

‎library/EngineBlock/Application/TestDiContainer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function getEncryptionKeysConfiguration()
7373

7474
return [
7575
'default' => [
76-
'publicFile' => '/etc/openconext/engineblock.crt',
76+
'publicFile' => '/config/engine/engineblock.crt',
7777
'privateFile' => $basePath . '/ci/qa-config/files/engineblock.pem',
7878
],
7979
];

0 commit comments

Comments
 (0)