Skip to content

Commit 1f2a8f6

Browse files
romayalonromayalon
committed
CR
Signed-off-by: Romy <35330373+romayalon@users.noreply.github.com>
1 parent b290eda commit 1f2a8f6

File tree

4 files changed

+57
-31
lines changed

4 files changed

+57
-31
lines changed

‎.github/workflows/mint-nc-tests.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,10 @@ jobs:
3232
cd ./noobaa-core
3333
mkdir -p logs/mint-nc-test-logs
3434
chmod 777 logs/mint-nc-test-logs
35-
35+
3636
- name: Run NC Mint tests
3737
run: |
3838
set -x
3939
cd ./noobaa-core
4040
make test-nc-mint -o tester
4141
42-
- name: Upload artifact
43-
if: always()
44-
uses: actions/upload-artifact@v4
45-
with:
46-
name: mint-nc-test-logs
47-
path: noobaa-core/logs/mint-nc-test-logs
48-
retention-days: "1"
49-

‎.github/workflows/mint-tests.yaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,18 @@ jobs:
2424

2525
- name: Load image
2626
run: docker load --input /tmp/noobaa-tester.tar
27-
27+
2828
- name: Create Mint logs directory
2929
run: |
3030
set -x
3131
cd ./noobaa-core
3232
mkdir -p logs/mint-test-logs
3333
chmod 777 logs/mint-test-logs
34-
34+
3535
- name: Run Mint tests
3636
run: |
3737
set -x
3838
cd ./noobaa-core
3939
make test-mint -o tester
4040
41-
- name: Upload artifact
42-
if: always()
43-
uses: actions/upload-artifact@v4
44-
with:
45-
name: mint-test-logs
46-
path: noobaa-core/logs/mint-test-logs
47-
retention-days: "1"
4841

‎Makefile

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -373,12 +373,16 @@ test-mint: tester
373373
@$(call create_docker_network)
374374
@$(call run_postgres)
375375
@echo "\033[1;34mRunning mint tests\033[0m"
376-
$(CONTAINER_ENGINE) run $(CPUSET) --name noobaa-$(GIT_COMMIT)-$(NAME_POSTFIX) -dit --network noobaa-net --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" --env "POSTGRES_HOST=coretest-postgres-$(GIT_COMMIT)-$(NAME_POSTFIX)" --env "POSTGRES_USER=noobaa" --env "DB_TYPE=postgres" --env "POSTGRES_DBNAME=coretest" -v $(PWD)/logs:/logs $(TESTER_TAG) bash -c "./src/test/system_tests/mint/run_mint_on_test_container.sh &> /logs/mint-test-logs/run_mint_on_test_container.log & tail -f /dev/null"
376+
$(CONTAINER_ENGINE) run $(CPUSET) --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) -dit --network noobaa-net --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" --env "POSTGRES_HOST=coretest-postgres-$(GIT_COMMIT)-$(NAME_POSTFIX)" --env "POSTGRES_USER=noobaa" --env "DB_TYPE=postgres" --env "POSTGRES_DBNAME=coretest" -v $(PWD)/logs/mint-test-logs/:/logs $(TESTER_TAG) bash -c "./src/test/system_tests/mint/run_mint_on_test_container.sh & tail -f /dev/null"
377377
sleep 180
378-
$(CONTAINER_ENGINE) run --name mint-$(GIT_COMMIT)-$(NAME_POSTFIX) --network noobaa-net -v $(PWD)/logs/mint-test-logs/:/mint/log --env SERVER_ENDPOINT=noobaa-$(GIT_COMMIT)-$(NAME_POSTFIX):$(MINT_NOOBAA_HTTP_ENDPOINT_PORT) --env ACCESS_KEY=$(MINT_MOCK_ACCESS_KEY) --env SECRET_KEY=$(MINT_MOCK_SECRET_KEY) --env ENABLE_HTTPS=0 minio/mint minio-go s3cmd
378+
$(CONTAINER_ENGINE) run --name mint-$(GIT_COMMIT)-$(NAME_POSTFIX) --network noobaa-net -v $(PWD)/logs/mint-test-logs/:/mint/log --env SERVER_ENDPOINT=noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX):$(MINT_NOOBAA_HTTP_ENDPOINT_PORT) --env ACCESS_KEY=$(MINT_MOCK_ACCESS_KEY) --env SECRET_KEY=$(MINT_MOCK_SECRET_KEY) --env ENABLE_HTTPS=0 minio/mint minio-go s3cmd
379+
@echo "\033[1;34mPrinting noobaa configuration and logs\033[0m"
380+
$(CONTAINER_ENGINE) logs noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX)
381+
@echo "\033[1;34mPrinting mint results file\033[0m"
382+
cat $(PWD)/logs/mint-test-logs/log.json
379383
@$(call disconnect_container_from_noobaa_network, mint-$(GIT_COMMIT)-$(NAME_POSTFIX))
380384
$(CONTAINER_ENGINE) rm mint-$(GIT_COMMIT)-$(NAME_POSTFIX)
381-
@$(call stop_noobaa, noobaa-$(GIT_COMMIT)-$(NAME_POSTFIX))
385+
@$(call stop_noobaa)
382386
@$(call stop_postgres)
383387
@$(call remove_docker_network)
384388
.PHONY: test-mint
@@ -387,12 +391,16 @@ test-mint: tester
387391
test-nc-mint: tester
388392
@echo "\033[1;34mRunning mint tests on NC environment\033[0m"
389393
@$(call create_docker_network)
390-
$(CONTAINER_ENGINE) run $(CPUSET) --name noobaa-$(GIT_COMMIT)-$(NAME_POSTFIX) -dit --privileged --user root --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" --network noobaa-net -v $(PWD)/logs:/logs $(TESTER_TAG) bash -c "./src/test/system_tests/mint/run_nc_mint_on_test_container.sh &> /logs/mint-nc-test-logs/run_nc_mint_on_test_container.log ; tail -f /dev/null"
391-
sleep 20
392-
$(CONTAINER_ENGINE) run --name mint-$(GIT_COMMIT)-$(NAME_POSTFIX) --network noobaa-net -v $(PWD)/logs/mint-nc-test-logs/:/mint/log --env RUN_ON_FAIL=0 --env SERVER_ENDPOINT=noobaa-$(GIT_COMMIT)-$(NAME_POSTFIX):$(MINT_NOOBAA_HTTP_ENDPOINT_PORT) --env ACCESS_KEY=$(MINT_MOCK_ACCESS_KEY) --env SECRET_KEY=$(MINT_MOCK_SECRET_KEY) --env ENABLE_HTTPS=0 minio/mint minio-go s3cmd
394+
$(CONTAINER_ENGINE) run $(CPUSET) --name noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX) -dit --privileged --user root --env "SUPPRESS_LOGS=$(SUPPRESS_LOGS)" --network noobaa-net -v $(PWD)/logs/mint-nc-test-logs/:/logs $(TESTER_TAG) bash -c "./src/test/system_tests/mint/run_nc_mint_on_test_container.sh; tail -f /dev/null"
395+
sleep 15
396+
$(CONTAINER_ENGINE) run --name mint-$(GIT_COMMIT)-$(NAME_POSTFIX) --network noobaa-net -v $(PWD)/logs/mint-nc-test-logs/:/mint/log --env RUN_ON_FAIL=0 --env SERVER_ENDPOINT=noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX):$(MINT_NOOBAA_HTTP_ENDPOINT_PORT) --env ACCESS_KEY=$(MINT_MOCK_ACCESS_KEY) --env SECRET_KEY=$(MINT_MOCK_SECRET_KEY) --env ENABLE_HTTPS=0 minio/mint minio-go s3cmd
397+
@echo "\033[1;34mPrinting noobaa configuration and logs\033[0m"
398+
$(CONTAINER_ENGINE) logs noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX)
399+
@echo "\033[1;34mPrinting mint results file\033[0m"
400+
cat $(PWD)/logs/mint-nc-test-logs/log.json
393401
@$(call disconnect_container_from_noobaa_network, mint-$(GIT_COMMIT)-$(NAME_POSTFIX))
394402
$(CONTAINER_ENGINE) rm mint-$(GIT_COMMIT)-$(NAME_POSTFIX)
395-
@$(call stop_noobaa, noobaa-$(GIT_COMMIT)-$(NAME_POSTFIX))
403+
@$(call stop_noobaa)
396404
@$(call remove_docker_network)
397405
.PHONY: test-nc-mint
398406

@@ -455,11 +463,9 @@ clean:
455463
##########
456464

457465
define stop_noobaa
458-
$(eval noobaa_container_name := $(if $(1),$(1),noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX)))
459-
@echo "\033[1;34mStopping/removing test container $(noobaa_container_name)\033[0m"
460-
$(call disconnect_container_from_noobaa_network, $(noobaa_container_name))
461-
$(CONTAINER_ENGINE) stop $(noobaa_container_name)
462-
$(CONTAINER_ENGINE) rm $(noobaa_container_name)
466+
@echo "\033[1;34mStopping/removing test container\033[0m"
467+
$(CONTAINER_ENGINE) stop noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX)
468+
$(CONTAINER_ENGINE) rm noobaa_$(GIT_COMMIT)_$(NAME_POSTFIX)
463469
@echo "\033[1;32mRemoving test container done.\033[0m"
464470
endef
465471

‎docs/CI & Tests/Mint.md

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,39 @@ If the noobaa-tester is already connected to noobaa-net, your Mint run command s
6969
docker run -e SERVER_ENDPOINT=<noobaa-tester-container-id-or-name>:<noobaa-http-endpoint-port> -e ACCESS_KEY=<pre-existing-account-access-key> -e SECRET_KEY=<pre-existing-account-secret-key> -e ENABLE_HTTPS=0 --network noobaa-net minio/mint <sdk-or-tool-name>
7070
```
7171

72-
Replace <sdk-or-tool-name> with the specific SDK or tool you want to test (e.g., aws-sdk-java, minio-go, s3cmd, etc.).
72+
Replace <sdk-or-tool-name> with the specific SDK or tool you want to test (e.g., aws-sdk-java, minio-go, s3cmd, etc.).
73+
74+
## Debugging Mint on NooBaa locally -
75+
Running `make test-mint` will generate the following debug log files -
76+
77+
```bash
78+
noobaa-core % tree logs/mint-test-logs
79+
logs/mint-test-logs
80+
├── log.json // contains the Mint run results
81+
├── minio-go
82+
│   └── error.log // contains errors coming from minio-go run
83+
├── mint-test-logs
84+
│   ├── backingstore1.log // contains noobaa backingstore logs
85+
│   ├── bg.log // contains noobaa BG workers logs
86+
│   ├── hosted_agents.log // contains noobaa hosted agents logs
87+
│   ├── s3.log // contains noobaa endpoint logs
88+
│   └── web.log // contains noobaa webserver logs
89+
└── s3cmd
90+
└── error.log // contains errors coming from s3-cmd run
91+
92+
```
93+
94+
Running `make test-nc-mint` will generate the following debug log files -
95+
96+
```bash
97+
noobaa-core % tree /mint-nc-test-logs
98+
logs/mint-nc-test-logs
99+
├── log.json // contains the Mint run results
100+
├── minio-go
101+
│   └── error.log // contains errors coming from minio-go run
102+
├── mint-nc-test-logs
103+
│   └── nsfs.log // contains NC noobaa endpoint logs
104+
└── s3cmd
105+
└── error.log // contains errors coming from s3-cmd run
106+
107+
```

0 commit comments

Comments
 (0)