From d909c19e17a58bf5498f0f4d05f79d5b713942dc Mon Sep 17 00:00:00 2001 From: Saw-jan Date: Tue, 20 Jan 2026 10:59:00 +0545 Subject: [PATCH] test: expose more test envs Signed-off-by: Saw-jan --- tests/acceptance/docker/Makefile | 24 +++++++++++++++---- tests/acceptance/docker/src/acceptance.yml | 3 ++- .../acceptance/docker/src/opencloud-base.yml | 2 +- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/tests/acceptance/docker/Makefile b/tests/acceptance/docker/Makefile index 4631401a1..c82535da4 100644 --- a/tests/acceptance/docker/Makefile +++ b/tests/acceptance/docker/Makefile @@ -54,18 +54,29 @@ else ifeq ($(STORAGE_DRIVER),decomposeds3) COMPOSE_FILE := src/ceph.yml:$(COMPOSE_FILE) endif +# use latest as default tag if OC_IMAGE is provided but no tag is set +ifneq ($(strip $(OC_IMAGE)),) + ifeq ($(strip $(OC_IMAGE_TAG)),) + OC_IMAGE_TAG := latest + endif +endif + COMPOSE_PROJECT_NAME := opencloud-acceptance-tests # Export variables for sub-make calls export COMPOSE_PROJECT_NAME export COMPOSE_FILE +export OC_IMAGE export OC_IMAGE_TAG +# test configurations export STORAGE_DRIVER export WITH_WRAPPER export BEHAT_SUITE export BEHAT_FEATURE +export TEST_SERVER_URL +export USE_BEARER_TOKEN ## make definition .PHONY: help @@ -86,15 +97,18 @@ help: @echo -e " ${YELLOW}clean-all\t\t${RESET}Clean all resources: images, containers, volumes, test files." @echo @echo "Available environment variables:" - @echo -e " ${PURPLE}OC_IMAGE_TAG\t\t${RESET}${CYAN}[image_tag]${RESET} Opencloud image tag to use. If provided, the dev image build is skipped." - @echo -e " ${PURPLE}WITH_WRAPPER\t\t${RESET}${CYAN}[true|false]${RESET} Start opencloud server using ocwrapper. Default: ${YELLOW}true${RESET}" + @echo -e " ${PURPLE}OC_IMAGE\t\t${RESET}${CYAN}[image_repo]${RESET} OpenCloud image to use. If provided, the dev image build is skipped." + @echo -e " ${PURPLE}OC_IMAGE_TAG\t\t${RESET}${CYAN}[image_tag]${RESET} OpenCloud image tag to use. If provided, the dev image build is skipped." + @echo -e " ${PURPLE}WITH_WRAPPER\t\t${RESET}${CYAN}[true|false]${RESET} Start OpenCloud server using ocwrapper. Default: ${YELLOW}true${RESET}" @echo -e " ${PURPLE}STORAGE_DRIVER\t${RESET}${CYAN}[posix|decomposed|decomposeds3]${RESET} Storage driver to use. Default: ${YELLOW}posix${RESET}" @echo -e " ${PURPLE}BEHAT_FEATURE\t\t${RESET}${RESET}${CYAN}[path]${RESET} Path to a feature file. Example: ${YELLOW}tests/acceptance/features/apiGraph/changeRole.feature${RESET}" @echo -e " ${PURPLE}BEHAT_SUITE\t\t${RESET}${RESET}${CYAN}[suite_name]${RESET} Test suite to run. Example: ${YELLOW}apiGraph${RESET}" + @echo -e " ${PURPLE}TEST_SERVER_URL\t${RESET}${CYAN}[url]${RESET} URL of the OpenCloud server to test against." + @echo -e " ${PURPLE}USE_BEARER_TOKEN\t${RESET}${CYAN}[true|false]${RESET} Use a bearer token for authentication. Default: ${YELLOW}false${RESET}" @echo @echo -e "Example usage:" @echo -e " ${PURPLE}WITH_WRAPPER${RESET}=${YELLOW}false${RESET} \\" - @echo -e " ${PURPLE}STORAGE_DRIVER${RESET}=${YELLOW}decomposed${RESET} \\" + @echo -e " ${PURPLE}STORAGE_DRIVER${RESET}=${YELLOW}posix${RESET} \\" @echo -e " ${PURPLE}BEHAT_FEATURE${RESET}=${YELLOW}tests/acceptance/features/apiGraph/changeRole.feature${RESET} \\" @echo -e " make ${GREEN}run-api-tests${RESET}" @@ -103,6 +117,8 @@ run-api-tests: $(OC_WRAPPER) build-dev-image clean-containers @echo "${BLUE}[INFO]${RESET} Compose project: ${YELLOW}$(COMPOSE_PROJECT_NAME)${RESET}" @echo "${BLUE}[INFO]${RESET} Compose file: ${YELLOW}$(COMPOSE_FILE)${RESET}" @echo "${BLUE}[INFO]${RESET} Using storage driver: ${YELLOW}$(STORAGE_DRIVER)${RESET}" + # force use local server when using this command + export TEST_SERVER_URL=https://opencloud-server:9200 $(MAKE) --no-print-directory start-services $(MAKE) --no-print-directory run-test-only @@ -129,7 +145,7 @@ $(OC_WRAPPER): .PHONY: build-dev-image build-dev-image: - @if [ -z "$(OC_IMAGE_TAG)" ]; then \ + @if [ -z "$(OC_IMAGE)" ] && [ -z "$(OC_IMAGE_TAG)" ]; then \ $(MAKE) --no-print-directory -C ../../../opencloud dev-docker \ ; fi; diff --git a/tests/acceptance/docker/src/acceptance.yml b/tests/acceptance/docker/src/acceptance.yml index c6122287d..a4d98255a 100644 --- a/tests/acceptance/docker/src/acceptance.yml +++ b/tests/acceptance/docker/src/acceptance.yml @@ -5,11 +5,12 @@ services: command: /bin/bash /test/run-tests.sh environment: OC_ROOT: /woodpecker/src/github.com/opencloud-eu/opencloud - TEST_SERVER_URL: https://opencloud-server:9200 + TEST_SERVER_URL: ${TEST_SERVER_URL:-https://opencloud-server:9200} OC_WRAPPER_URL: http://opencloud-server:5200 STORAGE_DRIVER: ${STORAGE_DRIVER:-posix} BEHAT_SUITE: ${BEHAT_SUITE:-} BEHAT_FEATURE: ${BEHAT_FEATURE:-} + USE_BEARER_TOKEN: ${USE_BEARER_TOKEN:-false} # email EMAIL_HOST: email EMAIL_PORT: 9000 diff --git a/tests/acceptance/docker/src/opencloud-base.yml b/tests/acceptance/docker/src/opencloud-base.yml index 49485addc..2e5c76e5f 100644 --- a/tests/acceptance/docker/src/opencloud-base.yml +++ b/tests/acceptance/docker/src/opencloud-base.yml @@ -1,6 +1,6 @@ services: opencloud-server: - image: opencloudeu/opencloud:${OC_IMAGE_TAG:-dev} + image: ${OC_IMAGE:-opencloudeu/opencloud}:${OC_IMAGE_TAG:-dev} entrypoint: ["/bin/sh", "/usr/bin/serve-opencloud.sh"] user: root environment: