From be3d27032e980a45624159dbd79967361f723bab Mon Sep 17 00:00:00 2001 From: Yadd Date: Mon, 12 Aug 2024 12:40:38 +0400 Subject: [PATCH] Fix CI --- base-no-s6/test | 28 +++++++++++++++++----------- base/test | 28 +++++++++++++++++----------- dev/test | 10 ++++++++-- full/test | 10 ++++++++-- portal/test | 10 ++++++++-- uwsgi-portal/test | 10 ++++++++-- 6 files changed, 66 insertions(+), 30 deletions(-) diff --git a/base-no-s6/test b/base-no-s6/test index 7f0b6aa..22aa784 100755 --- a/base-no-s6/test +++ b/base-no-s6/test @@ -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 diff --git a/base/test b/base/test index 7f0b6aa..22aa784 100755 --- a/base/test +++ b/base/test @@ -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 diff --git a/dev/test b/dev/test index a06c7a2..07f2539 100755 --- a/dev/test +++ b/dev/test @@ -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 diff --git a/full/test b/full/test index a06c7a2..07f2539 100755 --- a/full/test +++ b/full/test @@ -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 diff --git a/portal/test b/portal/test index a06c7a2..07f2539 100755 --- a/portal/test +++ b/portal/test @@ -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 diff --git a/uwsgi-portal/test b/uwsgi-portal/test index a06c7a2..07f2539 100755 --- a/uwsgi-portal/test +++ b/uwsgi-portal/test @@ -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