Skip to content

Commit a17dd2d

Browse files
authored
Remove deprecated container-structure-tests (#5214)
We use goss to run this kind of tests. related to SDE-4495 Signed-off-by: Rafa Porres Molina <rporresm@redhat.com>
1 parent c48aa5c commit a17dd2d

3 files changed

Lines changed: 3 additions & 145 deletions

File tree

Makefile

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: help build push rc build-test test-app test-container-image test clean
1+
.PHONY: help build push rc build-test test-app test clean
22

33
CONTAINER_ENGINE ?= $(shell which podman >/dev/null 2>&1 && echo podman || echo docker)
44
CONTAINER_UID ?= $(shell id -u)
@@ -19,8 +19,6 @@ else
1919
DOCKER_CONF := $(HOME)/.docker
2020
endif
2121

22-
CTR_STRUCTURE_IMG := quay.io/app-sre/container-structure-test:latest
23-
2422
help: ## Prints help for targets with comments
2523
@grep -E '^[a-zA-Z0-9.\ _-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
2624

@@ -37,15 +35,7 @@ print-host-versions:
3735
@$(CONTAINER_ENGINE) --version
3836
python3 --version
3937

40-
test-container-image: build ## Target to test the final image
41-
@CONTAINER_ENGINE=$(CONTAINER_ENGINE) \
42-
CTR_STRUCTURE_IMG=$(CTR_STRUCTURE_IMG) \
43-
CURDIR=$(CURDIR) \
44-
IMAGE_NAME=$(IMAGE_NAME) \
45-
IMAGE_TAG=$(IMAGE_TAG) \
46-
$(CURDIR)/run-test-container-image.sh
47-
48-
test: print-host-versions test-app test-container-image
38+
test: print-host-versions test-app
4939

5040
dev-reconcile-loop: build-dev ## Trigger the reconcile loop inside a container for an integration
5141
@$(CONTAINER_ENGINE) run --rm -it \

dockerfiles/README.md

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -58,33 +58,4 @@ as the `CMD` in the 3rd build stage labeled prod-image.
5858
## Testing
5959

6060
The [Makefile](../Makefile) has the target `test` that runs the tests for the
61-
qontract reconcile:
62-
63-
```Makefile
64-
test: test-app test-container-image
65-
```
66-
67-
The relationship for the targets is as follows:
68-
69-
```text
70-
+------+
71-
| test |
72-
+------+
73-
/ \
74-
v v
75-
+----------+ +----------------------+
76-
| test-app | | test-container-image |
77-
+----------+ +----------------------+
78-
| |
79-
| |
80-
v |
81-
+------------+ |
82-
| all-tests | |
83-
+------------+ v
84-
+---------+
85-
| build |
86-
+---------+
87-
```
88-
89-
The target `test-container-image` builds the image and runs structure tests to test
90-
the images structure, `test-app` builds the image for testing and runs the unit tests `all-tests`
61+
qontract reconcile.

run-test-container-image.sh

Lines changed: 0 additions & 103 deletions
This file was deleted.

0 commit comments

Comments
 (0)