From c7ba83255693a09390254df8f56b36d258751621 Mon Sep 17 00:00:00 2001 From: Shivam Sandbhor Date: Sun, 17 Oct 2021 10:25:27 +0530 Subject: [PATCH] Remove bundle test and it's fixtures (#1443) Signed-off-by: Shivam Sandbhor --- script/test/cmd/tests.sh | 6 - .../bundles/dab/docker-compose-bundle.dab | 25 -- .../test/fixtures/bundles/dab/output-k8s.json | 137 ------- .../bundles/dsb/docker-voting-bundle.dsb | 65 ---- .../test/fixtures/bundles/dsb/output-k8s.json | 340 ------------------ 5 files changed, 573 deletions(-) delete mode 100644 script/test/fixtures/bundles/dab/docker-compose-bundle.dab delete mode 100644 script/test/fixtures/bundles/dab/output-k8s.json delete mode 100644 script/test/fixtures/bundles/dsb/docker-voting-bundle.dsb delete mode 100644 script/test/fixtures/bundles/dsb/output-k8s.json diff --git a/script/test/cmd/tests.sh b/script/test/cmd/tests.sh index d03401a0..9f67f162 100755 --- a/script/test/cmd/tests.sh +++ b/script/test/cmd/tests.sh @@ -274,12 +274,6 @@ convert::expect_failure "kompose up $KOMPOSE_ROOT/script/test/fixtures/gitlab/do convert::expect_failure "kompose down $KOMPOSE_ROOT/script/test/fixtures/gitlab/docker-compose.yml -j" "Unknown Argument docker-gitlab.yml" convert::expect_failure "kompose convert $KOMPOSE_ROOT/script/test/fixtures/gitlab/docker-compose.yml -j" "Unknown Argument docker-gitlab.yml" -# Tests related to kompose --bundle convert usage and that setting the compose file results in a failure -# We no longer test --bundle, however, this command may come back in the future thus we are keeping the test commented -# convert::expect_failure "kompose -f $KOMPOSE_ROOT/script/test/fixtures/bundles/foo.yml --bundle $KOMPOSE_ROOT/script/test/fixtures/bundles/dab/docker-compose-bundle.dab convert" -# convert::expect_success "kompose --bundle $KOMPOSE_ROOT/script/test/fixtures/bundles/dab/docker-compose-bundle.dab convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/bundles/dab/output-k8s.json" -# convert::expect_success_and_warning "kompose --bundle $KOMPOSE_ROOT/script/test/fixtures/bundles/dsb/docker-voting-bundle.dsb convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/bundles/dsb/output-k8s.json" "Unsupported Networks key - ignoring" - # Test related to multiple-compose files # Kubernetes test cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/multiple-compose-files/docker-k8s.yml -f $KOMPOSE_ROOT/script/test/fixtures/multiple-compose-files/docker-os.yml convert --stdout -j" diff --git a/script/test/fixtures/bundles/dab/docker-compose-bundle.dab b/script/test/fixtures/bundles/dab/docker-compose-bundle.dab deleted file mode 100644 index 3a7e4e30..00000000 --- a/script/test/fixtures/bundles/dab/docker-compose-bundle.dab +++ /dev/null @@ -1,25 +0,0 @@ -{ - "services": { - "redis": { - "Image": "redis@sha256:561a224089a0c9a59de16bd596403010b42f417ef7c17142e9b64d7524e97beb", - "Networks": [], - "Ports": [ - { - "Port": 6379, - "Protocol": "tcp" - } - ] - }, - "web": { - "Image": "tuna/docker-counter23@sha256:c6755a375f5eda203c35940cbd05625517207efca4015e6a4a2c6fdef08cf5ed", - "Networks": [], - "Ports": [ - { - "Port": 5000, - "Protocol": "tcp" - } - ] - } - }, - "version": "0.1" -} \ No newline at end of file diff --git a/script/test/fixtures/bundles/dab/output-k8s.json b/script/test/fixtures/bundles/dab/output-k8s.json deleted file mode 100644 index e2917fce..00000000 --- a/script/test/fixtures/bundles/dab/output-k8s.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": {}, - "items": [ - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - "labels": { - "io.kompose.service": "redis" - } - }, - "spec": { - "ports": [ - { - "name": "6379", - "port": 6379, - "targetPort": 6379 - } - ], - "selector": { - "io.kompose.service": "redis" - } - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "web", - "creationTimestamp": null, - "labels": { - "io.kompose.service": "web" - } - }, - "spec": { - "ports": [ - { - "name": "5000", - "port": 5000, - "targetPort": 5000 - } - ], - "selector": { - "io.kompose.service": "web" - } - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "Deployment", - "apiVersion": "apps/v1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - "labels": { - "io.kompose.service": "redis" - } - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "io.kompose.service": "redis" - } - }, - "spec": { - "containers": [ - { - "name": "redis", - "image": "redis", - "ports": [ - { - "containerPort": 6379 - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} - }, - { - "kind": "Deployment", - "apiVersion": "apps/v1", - "metadata": { - "name": "web", - "creationTimestamp": null, - "labels": { - "io.kompose.service": "web" - } - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "io.kompose.service": "web" - } - }, - "spec": { - "containers": [ - { - "name": "web", - "image": "tuna/docker-counter23", - "ports": [ - { - "containerPort": 5000 - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} - } - ] -} diff --git a/script/test/fixtures/bundles/dsb/docker-voting-bundle.dsb b/script/test/fixtures/bundles/dsb/docker-voting-bundle.dsb deleted file mode 100644 index b9bff043..00000000 --- a/script/test/fixtures/bundles/dsb/docker-voting-bundle.dsb +++ /dev/null @@ -1,65 +0,0 @@ -{ - "Services": { - "db": { - "Image": "postgres@sha256:33632bbd3222fa738d80a267b7c706a15d76eb3a59facab94bbd52a69cd1e30c", - "Labels": { - "com.example.description": "Postgres Database" - }, - "Networks": [ - "default" - ], - "Ports": [ - { - "Port": 5432, - "Protocol": "tcp" - } - ] - }, - "redis": { - "Image": "redis@sha256:afa4e7f6dc4d4f4294f54835bcfe610201057f5424b36310cba799e625849ebd", - "Networks": [ - "default" - ], - "Ports": [ - { - "Port": 6379, - "Protocol": "tcp" - } - ] - }, - "result": { - "Image": "tmadams333/example-voting-app-result@sha256:97d6ba26e5ffa35a89a3d97627fa3c8a3b0b3df8e708129eabcf9f2755e06d13", - "Networks": [ - "default" - ], - "Ports": [ - { - "Port": 80, - "Protocol": "tcp" - } - ] - }, - "vote": { - "Image": "docker/example-voting-app-vote@sha256:33f7924f9aaabd2aacf3f59a9c98e372360213ec94cb35f60842502632ec2f74", - "Labels": { - "com.example.description": "Vote" - }, - "Networks": [ - "default" - ], - "Ports": [ - { - "Port": 80, - "Protocol": "tcp" - } - ] - }, - "worker": { - "Image": "docker/example-voting-app-worker@sha256:62cbf0976fc66192d19412135fc422bfaaed5987a8ae405ff4d1968f1b714f24", - "Networks": [ - "default" - ] - } - }, - "Version": "0.1" -} diff --git a/script/test/fixtures/bundles/dsb/output-k8s.json b/script/test/fixtures/bundles/dsb/output-k8s.json deleted file mode 100644 index 4622d917..00000000 --- a/script/test/fixtures/bundles/dsb/output-k8s.json +++ /dev/null @@ -1,340 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": {}, - "items": [ - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "db", - "creationTimestamp": null, - "labels": { - "io.kompose.service": "db" - }, - "annotations": { - "com.example.description": "Postgres Database" - } - }, - "spec": { - "ports": [ - { - "name": "5432", - "port": 5432, - "targetPort": 5432 - } - ], - "selector": { - "io.kompose.service": "db" - } - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - "labels": { - "io.kompose.service": "redis" - } - }, - "spec": { - "ports": [ - { - "name": "6379", - "port": 6379, - "targetPort": 6379 - } - ], - "selector": { - "io.kompose.service": "redis" - } - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "result", - "creationTimestamp": null, - "labels": { - "io.kompose.service": "result" - } - }, - "spec": { - "ports": [ - { - "name": "80", - "port": 80, - "targetPort": 80 - } - ], - "selector": { - "io.kompose.service": "result" - } - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "vote", - "creationTimestamp": null, - "labels": { - "io.kompose.service": "vote" - }, - "annotations": { - "com.example.description": "Vote" - } - }, - "spec": { - "ports": [ - { - "name": "80", - "port": 80, - "targetPort": 80 - } - ], - "selector": { - "io.kompose.service": "vote" - } - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "worker", - "creationTimestamp": null, - "labels": { - "io.kompose.service": "worker" - } - }, - "spec": { - "ports": [ - { - "name": "headless", - "port": 55555, - "targetPort": 0 - } - ], - "selector": { - "io.kompose.service": "worker" - }, - "clusterIP": "None" - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "Deployment", - "apiVersion": "apps/v1", - "metadata": { - "name": "db", - "creationTimestamp": null, - "labels": { - "io.kompose.service": "db" - }, - "annotations": { - "com.example.description": "Postgres Database" - } - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "io.kompose.service": "db" - } - }, - "spec": { - "containers": [ - { - "name": "db", - "image": "postgres", - "ports": [ - { - "containerPort": 5432 - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} - }, - { - "kind": "Deployment", - "apiVersion": "apps/v1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - "labels": { - "io.kompose.service": "redis" - } - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "io.kompose.service": "redis" - } - }, - "spec": { - "containers": [ - { - "name": "redis", - "image": "redis", - "ports": [ - { - "containerPort": 6379 - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} - }, - { - "kind": "Deployment", - "apiVersion": "apps/v1", - "metadata": { - "name": "result", - "creationTimestamp": null, - "labels": { - "io.kompose.service": "result" - } - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "io.kompose.service": "result" - } - }, - "spec": { - "containers": [ - { - "name": "result", - "image": "tmadams333/example-voting-app-result", - "ports": [ - { - "containerPort": 80 - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} - }, - { - "kind": "Deployment", - "apiVersion": "apps/v1", - "metadata": { - "name": "vote", - "creationTimestamp": null, - "labels": { - "io.kompose.service": "vote" - }, - "annotations": { - "com.example.description": "Vote" - } - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "io.kompose.service": "vote" - } - }, - "spec": { - "containers": [ - { - "name": "vote", - "image": "docker/example-voting-app-vote", - "ports": [ - { - "containerPort": 80 - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} - }, - { - "kind": "Deployment", - "apiVersion": "apps/v1", - "metadata": { - "name": "worker", - "creationTimestamp": null, - "labels": { - "io.kompose.service": "worker" - } - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "io.kompose.service": "worker" - } - }, - "spec": { - "containers": [ - { - "name": "worker", - "image": "docker/example-voting-app-worker", - "resources": {} - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} - } - ] -}