From b575e93cdfc82aadc39664d7a3cbcd46925080f7 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 26 May 2021 15:25:09 +0200 Subject: [PATCH] [CI SKIP] first fixes --- tests/acceptance/docker/src/acceptance.yml | 2 ++ tests/acceptance/docker/src/ocis-base.yml | 14 ++++-------- tests/acceptance/docker/src/run-tests.sh | 26 ++++++++++++++-------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/tests/acceptance/docker/src/acceptance.yml b/tests/acceptance/docker/src/acceptance.yml index 62d114fdb..9a60e0a72 100644 --- a/tests/acceptance/docker/src/acceptance.yml +++ b/tests/acceptance/docker/src/acceptance.yml @@ -7,9 +7,11 @@ services: PATH_TO_CORE: /srv/app/testrunner SKELETON_DIR: /srv/app/tmp/testing/data/apiSkeleton TEST_OCIS: "true" + RUN_ON_OCIS: "true" TEST_SERVER_URL: https://ocis-server:9200 TESTING_DIR: /srv/app/tmp/testing + STORAGE_DRIVER: $STORAGE STORAGE: $STORAGE TEST_SOURCE: $TEST_SOURCE BEHAT_SUITE: ${BEHAT_SUITE:-} diff --git a/tests/acceptance/docker/src/ocis-base.yml b/tests/acceptance/docker/src/ocis-base.yml index 76d6fb48c..1dab4035a 100644 --- a/tests/acceptance/docker/src/ocis-base.yml +++ b/tests/acceptance/docker/src/ocis-base.yml @@ -8,19 +8,13 @@ services: STORAGE_METADATA_ROOT: /srv/app/tmp/ocis/metadata STORAGE_DRIVER_OWNCLOUD_DATADIR: /srv/app/tmp/ocis/owncloud/data STORAGE_DRIVER_OWNCLOUD_REDIS_ADDR: redis:6379 - STORAGE_LDAP_IDP: https://ocis-server:9200 - STORAGE_OIDC_ISSUER: https://ocis-server:9200 - PROXY_OIDC_ISSUER: https://ocis-server:9200 STORAGE_HOME_DATA_SERVER_URL: http://ocis-server:9155/data - STORAGE_DATAGATEWAY_PUBLIC_URL: https://ocis-server:9200/data STORAGE_USERS_DATA_SERVER_URL: http://ocis-server:9158/data - STORAGE_FRONTEND_PUBLIC_URL: https://ocis-server:9200 STORAGE_SHARING_USER_JSON_FILE: /srv/app/tmp/ocis/shares.json + SETTINGS_DATA_PATH: "/srv/app/tmp/ocis/settings" PROXY_ENABLE_BASIC_AUTH: "true" - PHOENIX_WEB_CONFIG: /drone/src/ocis/tests/config/drone/ocis-config.json - IDP_IDENTIFIER_REGISTRATION_CONF: /drone/src/ocis/tests/config/drone/identifier-registration.yml - IDP_ISS: https://ocis-server:9200 - IDP_TLS: "true" + WEB_UI_CONFIG: /drone/src/tests/config/drone/ocis-config.json + IDP_IDENTIFIER_REGISTRATION_CONF: /drone/src/tests/config/drone/identifier-registration.yml ACCOUNTS_HASH_DIFFICULTY: 4 # s3ng specific settings STORAGE_DRIVER_S3NG_ENDPOINT: http://ceph:8080 @@ -29,7 +23,7 @@ services: STORAGE_DRIVER_S3NG_SECRET_KEY: test STORAGE_DRIVER_S3NG_BUCKET: test volumes: - - ../../../config:/drone/src/ocis/tests/config + - ../../../config:/drone/src/tests/config - oCISownCloud10testsuite:/srv volumes: diff --git a/tests/acceptance/docker/src/run-tests.sh b/tests/acceptance/docker/src/run-tests.sh index 96d0f3876..d40f5a65a 100644 --- a/tests/acceptance/docker/src/run-tests.sh +++ b/tests/acceptance/docker/src/run-tests.sh @@ -29,14 +29,12 @@ then if [ "$STORAGE" = "owncloud" ] then export OCIS_REVA_DATA_ROOT='/srv/app/tmp/ocis/owncloud/data/' - export DELETE_USER_DATA_CMD='' export BEHAT_FILTER_TAGS='~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@local_storage&&~@skipOnOcis-OC-Storage' export OCIS_SKELETON_STRATEGY='copy' export EXPECTED_FAILURES_FILE='/drone/src/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md' elif [ "$STORAGE" = "ocis" ] then export OCIS_REVA_DATA_ROOT='' - export DELETE_USER_DATA_CMD='rm -rf /srv/app/tmp/ocis/storage/users/nodes/root/* /srv/app/tmp/ocis/storage/users/nodes/*-*-*-*' export BEHAT_FILTER_TAGS='~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@local_storage&&~@skipOnOcis-OCIS-Storage' export OCIS_SKELETON_STRATEGY='upload' export EXPECTED_FAILURES_FILE='/drone/src/tests/acceptance/expected-failures-API-on-OCIS-storage.md' @@ -52,20 +50,18 @@ then if [ "$STORAGE" = "owncloud" ] then - export BEHAT_FILTER_TAGS='~@skipOnOcis-OC-Storage' - export DELETE_USER_DATA_CMD='' + export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOcis-OC-Storage' export OCIS_REVA_DATA_ROOT='/srv/app/tmp/ocis/owncloud/data/' export OCIS_SKELETON_STRATEGY='copy' elif [ "$STORAGE" = "ocis" ] then - export BEHAT_FILTER_TAGS='~@skipOnOcis-OCIS-Storage' - export DELETE_USER_DATA_CMD='rm -rf /srv/app/tmp/ocis/storage/users/nodes/root/* /srv/app/tmp/ocis/storage/users/nodes/*-*-*-*' + export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOcis-OCIS-Storage' + #export OCIS_REVA_DATA_ROOT='/srv/app/tmp/ocis/owncloud/data' export OCIS_REVA_DATA_ROOT='' export OCIS_SKELETON_STRATEGY='upload' elif [ "$STORAGE" = "s3ng" ] then - export BEHAT_FILTER_TAGS='~@skipOnOcis-S3NG-Storage' - export DELETE_USER_DATA_CMD='rm -rf /srv/app/tmp/ocis/storage/users/nodes/root/* /srv/app/tmp/ocis/storage/users/nodes/*-*-*-*' + export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOcis-S3NG-Storage' export OCIS_REVA_DATA_ROOT='' export OCIS_SKELETON_STRATEGY='upload' else @@ -89,8 +85,20 @@ then unset DIVIDE_INTO_NUM_PARTS unset RUN_PART unset EXPECTED_FAILURES_FILE +else + unset BEHAT_FEATURE fi +echo "#################" +echo "#################" +echo "#################" +echo "#################" +printenv +echo "#################" +echo "#################" +echo "#################" +echo "#################" + ## RUN TEST if [ "$TEST_SOURCE" = "oc10" ] @@ -100,7 +108,7 @@ elif [ "$TEST_SOURCE" = "ocis" ] then cd $OCIS_ROOT sleep 10 - make test-acceptance-api + make -C /drone/src test-acceptance-api else echo "non existing TEST_SOURCE selected" exit 1