Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
guimard committed Aug 12, 2024
1 parent cfe80e9 commit be3d270
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 30 deletions.
28 changes: 17 additions & 11 deletions base-no-s6/test
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
#!/bin/sh

if which docker-compose; then
COMPOSE='docker-compose'
else
COMPOSE='docker compose'
fi

set -e

docker-compose run base cat /etc/lemonldap-ng/lemonldap-ng.ini | grep 'dbiChain=DBI:Pg:database=lemonldapng;host=db'
docker-compose run base /usr/share/docker-llng/updateConf get persistentStorage | grep Apache::Session::Browseable::PgJSON
docker-compose run base /usr/share/docker-llng/updateConf get globalStorage | grep Apache::Session::Browseable::Redis
docker-compose run base /usr/share/docker-llng/updateConf get globalStorageOptions Index | grep _whatToTrace
docker-compose run base /usr/share/docker-llng/updateConf get domain | grep debian.org
docker-compose run base /usr/share/docker-llng/updateConf get authChoiceModules | grep 1_LDAP
docker-compose run base /usr/share/docker-llng/updateConf get applicationList 1sample catname | grep "Some applications"
docker-compose run base /usr/share/docker-llng/updateConf get exportedVars aa | grep bb
docker-compose run base /usr/share/docker-llng/updateConf get macros | grep ZZ
docker-compose run base /usr/share/docker-llng/updateConf get portal | grep dockertest.com
docker-compose down
$COMPOSE run base cat /etc/lemonldap-ng/lemonldap-ng.ini | grep 'dbiChain=DBI:Pg:database=lemonldapng;host=db'
$COMPOSE run base /usr/share/docker-llng/updateConf get persistentStorage | grep Apache::Session::Browseable::PgJSON
$COMPOSE run base /usr/share/docker-llng/updateConf get globalStorage | grep Apache::Session::Browseable::Redis
$COMPOSE run base /usr/share/docker-llng/updateConf get globalStorageOptions Index | grep _whatToTrace
$COMPOSE run base /usr/share/docker-llng/updateConf get domain | grep debian.org
$COMPOSE run base /usr/share/docker-llng/updateConf get authChoiceModules | grep 1_LDAP
$COMPOSE run base /usr/share/docker-llng/updateConf get applicationList 1sample catname | grep "Some applications"
$COMPOSE run base /usr/share/docker-llng/updateConf get exportedVars aa | grep bb
$COMPOSE run base /usr/share/docker-llng/updateConf get macros | grep ZZ
$COMPOSE run base /usr/share/docker-llng/updateConf get portal | grep dockertest.com
$COMPOSE down
28 changes: 17 additions & 11 deletions base/test
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
#!/bin/sh

if which docker-compose; then
COMPOSE='docker-compose'
else
COMPOSE='docker compose'
fi

set -e

docker-compose run base cat /etc/lemonldap-ng/lemonldap-ng.ini | grep 'dbiChain=DBI:Pg:database=lemonldapng;host=db'
docker-compose run base /usr/share/docker-llng/updateConf get persistentStorage | grep Apache::Session::Browseable::PgJSON
docker-compose run base /usr/share/docker-llng/updateConf get globalStorage | grep Apache::Session::Browseable::Redis
docker-compose run base /usr/share/docker-llng/updateConf get globalStorageOptions Index | grep _whatToTrace
docker-compose run base /usr/share/docker-llng/updateConf get domain | grep debian.org
docker-compose run base /usr/share/docker-llng/updateConf get authChoiceModules | grep 1_LDAP
docker-compose run base /usr/share/docker-llng/updateConf get applicationList 1sample catname | grep "Some applications"
docker-compose run base /usr/share/docker-llng/updateConf get exportedVars aa | grep bb
docker-compose run base /usr/share/docker-llng/updateConf get macros | grep ZZ
docker-compose run base /usr/share/docker-llng/updateConf get portal | grep dockertest.com
docker-compose down
$COMPOSE run base cat /etc/lemonldap-ng/lemonldap-ng.ini | grep 'dbiChain=DBI:Pg:database=lemonldapng;host=db'
$COMPOSE run base /usr/share/docker-llng/updateConf get persistentStorage | grep Apache::Session::Browseable::PgJSON
$COMPOSE run base /usr/share/docker-llng/updateConf get globalStorage | grep Apache::Session::Browseable::Redis
$COMPOSE run base /usr/share/docker-llng/updateConf get globalStorageOptions Index | grep _whatToTrace
$COMPOSE run base /usr/share/docker-llng/updateConf get domain | grep debian.org
$COMPOSE run base /usr/share/docker-llng/updateConf get authChoiceModules | grep 1_LDAP
$COMPOSE run base /usr/share/docker-llng/updateConf get applicationList 1sample catname | grep "Some applications"
$COMPOSE run base /usr/share/docker-llng/updateConf get exportedVars aa | grep bb
$COMPOSE run base /usr/share/docker-llng/updateConf get macros | grep ZZ
$COMPOSE run base /usr/share/docker-llng/updateConf get portal | grep dockertest.com
$COMPOSE down
10 changes: 8 additions & 2 deletions dev/test
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
#!/bin/sh

if which docker-compose; then
COMPOSE='docker-compose'
else
COMPOSE='docker compose'
fi

set -e
cd __test__
docker-compose run --rm test
docker-compose down
$COMPOSE run --rm test
$COMPOSE down
10 changes: 8 additions & 2 deletions full/test
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
#!/bin/sh

if which docker-compose; then
COMPOSE='docker-compose'
else
COMPOSE='docker compose'
fi

set -e
cd __test__
docker-compose run --rm test
docker-compose down
$COMPOSE run --rm test
$COMPOSE down
10 changes: 8 additions & 2 deletions portal/test
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
#!/bin/sh

if which docker-compose; then
COMPOSE='docker-compose'
else
COMPOSE='docker compose'
fi

set -e
cd __test__
docker-compose run --rm test
docker-compose down
$COMPOSE run --rm test
$COMPOSE down
10 changes: 8 additions & 2 deletions uwsgi-portal/test
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
#!/bin/sh

if which docker-compose; then
COMPOSE='docker-compose'
else
COMPOSE='docker compose'
fi

set -e
cd __test__
docker-compose run --rm test
docker-compose down
$COMPOSE run --rm test
$COMPOSE down

0 comments on commit be3d270

Please sign in to comment.