From 36aa6d8c3b4abcfd3779a76309cc084fe2b09ba7 Mon Sep 17 00:00:00 2001 From: Suraj Deshmukh Date: Wed, 17 Aug 2016 21:45:27 +0530 Subject: [PATCH] Fix output comparison for cmd tests Now check on true as comparison output, then PASS, if anything else just fail on it. This avoids all the false positives. --- script/test/cmd/lib.sh | 4 +- script/test/cmd/tests.sh | 19 -- script/test/fixtures/etherpad/output-k8s.json | 76 ++++---- script/test/fixtures/flask-redis/README.md | 10 - .../fixtures/flask-redis/docker-compose.yml | 20 -- .../test/fixtures/flask-redis/output-k8s.json | 159 --------------- .../test/fixtures/flask-redis/output-os.json | 179 ----------------- script/test/fixtures/gitlab/output-k8s.json | 184 +++++++++--------- .../fixtures/ngnix-node-redis/output-k8s.json | 10 +- script/test/fixtures/wordpress/README.md | 14 -- .../fixtures/wordpress/docker-compose.yml | 25 --- script/test/fixtures/wordpress/envs | 6 - .../test/fixtures/wordpress/output-k8s.json | 171 ---------------- script/test/fixtures/wordpress/output-os.json | 171 ---------------- 14 files changed, 137 insertions(+), 911 deletions(-) delete mode 100644 script/test/fixtures/flask-redis/README.md delete mode 100644 script/test/fixtures/flask-redis/docker-compose.yml delete mode 100644 script/test/fixtures/flask-redis/output-k8s.json delete mode 100644 script/test/fixtures/flask-redis/output-os.json delete mode 100644 script/test/fixtures/wordpress/README.md delete mode 100644 script/test/fixtures/wordpress/docker-compose.yml delete mode 100644 script/test/fixtures/wordpress/envs delete mode 100644 script/test/fixtures/wordpress/output-k8s.json delete mode 100644 script/test/fixtures/wordpress/output-os.json diff --git a/script/test/cmd/lib.sh b/script/test/cmd/lib.sh index bcaf712be..83b7dac30 100644 --- a/script/test/cmd/lib.sh +++ b/script/test/cmd/lib.sh @@ -69,8 +69,8 @@ function convert::match_output() { match=$(jq --argfile a $TEMP_STDOUT --argfile b $expected_output -n 'def post_recurse(f): def r: (f | select(. != null) | r), .; r; def post_recurse: post_recurse(.[]?); ($a | (post_recurse | arrays) |= sort) as $a | ($b | (post_recurse | arrays) |= sort) as $b | $a == $b') - if [ "$match" = false ]; then FAIL_MSGS=$FAIL_MSGS"converted output does not match\n"; return 1; - else SUCCESS_MSGS=$SUCCESS_MSGS"converted output matches\n"; return 0; fi + if [ "$match" = true ]; then SUCCESS_MSGS=$SUCCESS_MSGS"converted output matches\n"; return 0; + else FAIL_MSGS=$FAIL_MSGS"converted output does not match\n"; return 1; fi } readonly -f convert::match_output diff --git a/script/test/cmd/tests.sh b/script/test/cmd/tests.sh index 2ff5601b6..144d73d58 100755 --- a/script/test/cmd/tests.sh +++ b/script/test/cmd/tests.sh @@ -17,13 +17,6 @@ convert::expect_success_and_warning "kompose convert --stdout -f $KOMPOSE_ROOT/s convert::expect_success_and_warning "kompose convert --stdout --dc -f $KOMPOSE_ROOT/script/test/fixtures/etherpad/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/etherpad/output-os.json" "Unsupported key depends_on - ignoring" unset $(cat $KOMPOSE_ROOT/script/test/fixtures/etherpad/envs | cut -d'=' -f1) -###### -# Tests related to docker-compose file in script/test/fixtures/flask-redis -# kubernetes test -convert::expect_success_and_warning "kompose convert --stdout -f $KOMPOSE_ROOT/script/test/fixtures/flask-redis/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/flask-redis/output-k8s.json" "Unsupported key depends_on - ignoring" -# openshift test -convert::expect_success_and_warning "kompose convert --stdout --dc -f $KOMPOSE_ROOT/script/test/fixtures/flask-redis/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/flask-redis/output-os.json" "Unsupported key depends_on - ignoring" - ###### # Tests related to docker-compose file in /script/test/fixtures/gitlab convert::expect_failure "kompose convert --stdout -f $KOMPOSE_ROOT/script/test/fixtures/gitlab/docker-compose.yml" @@ -41,17 +34,5 @@ convert::expect_success_and_warning "kompose convert --stdout -f $KOMPOSE_ROOT/s # openshift test convert::expect_success_and_warning "kompose convert --stdout --dc -f $KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/output-os.json" "Unsupported key build - ignoring" - -###### -# Tests related to docker-compose file in /script/test/fixtures/wordpress -convert::expect_failure "kompose convert --stdout -f $KOMPOSE_ROOT/script/test/fixtures/wordpress/docker-compose.yml" -export $(cat $KOMPOSE_ROOT/script/test/fixtures/wordpress/envs) -# kubernetes test -convert::expect_success_and_warning "kompose convert --stdout -f $KOMPOSE_ROOT/script/test/fixtures/wordpress/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/wordpress/output-k8s.json" "Unsupported key depends_on - ignoring" -# openshift test -convert::expect_success_and_warning "kompose convert --stdout -f $KOMPOSE_ROOT/script/test/fixtures/wordpress/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/wordpress/output-os.json" "Unsupported key depends_on - ignoring" -unset $(cat $KOMPOSE_ROOT/script/test/fixtures/wordpress/envs | cut -d'=' -f1) - - exit $EXIT_STATUS diff --git a/script/test/fixtures/etherpad/output-k8s.json b/script/test/fixtures/etherpad/output-k8s.json index f2739620f..47fb7dbb0 100644 --- a/script/test/fixtures/etherpad/output-k8s.json +++ b/script/test/fixtures/etherpad/output-k8s.json @@ -7,8 +7,8 @@ "kind": "Deployment", "apiVersion": "extensions/v1beta1", "metadata": { - "name": "etherpad", - "creationTimestamp": null, + "name": "mariadb", + "creationTimestamp": null }, "spec": { "replicas": 1, @@ -16,39 +16,35 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "etherpad" + "service": "mariadb" } }, "spec": { "containers": [ { - "name": "etherpad", - "image": "centos/etherpad", + "name": "mariadb", + "image": "centos/mariadb", "ports": [ { - "containerPort": 9001, + "containerPort": 3306, "protocol": "TCP" } ], "env": [ { - "name": "DB_DBID", + "name": "MYSQL_DATABASE", "value": "etherpad" }, { - "name": "DB_HOST", - "value": "mariadb" - }, - { - "name": "DB_PASS", + "name": "MYSQL_PASSWORD", "value": "etherpad" }, { - "name": "DB_PORT", - "value": "3306" + "name": "MYSQL_ROOT_PASSWORD", + "value": "etherpad" }, { - "name": "DB_USER", + "name": "MYSQL_USER", "value": "etherpad" } ], @@ -66,23 +62,23 @@ "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "etherpad", + "name": "mariadb", "creationTimestamp": null, "labels": { - "service": "etherpad" + "service": "mariadb" } }, "spec": { "ports": [ { - "name": "80", + "name": "3306", "protocol": "TCP", - "port": 80, - "targetPort": 9001 + "port": 3306, + "targetPort": 3306 } ], "selector": { - "service": "etherpad" + "service": "mariadb" } }, "status": { @@ -93,8 +89,8 @@ "kind": "Deployment", "apiVersion": "extensions/v1beta1", "metadata": { - "name": "mariadb", - "creationTimestamp": null, + "name": "etherpad", + "creationTimestamp": null }, "spec": { "replicas": 1, @@ -102,36 +98,40 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "mariadb" + "service": "etherpad" } }, "spec": { "containers": [ { - "name": "mariadb", - "image": "centos/mariadb", + "name": "etherpad", + "image": "centos/etherpad", "ports": [ { - "containerPort": 3306, + "containerPort": 9001, "protocol": "TCP" } ], "env": [ { - "name": "MYSQL_USER", + "name": "DB_USER", "value": "etherpad" }, { - "name": "MYSQL_DATABASE", + "name": "DB_DBID", "value": "etherpad" }, { - "name": "MYSQL_PASSWORD", - "value": "etherpad" + "name": "DB_HOST", + "value": "mariadb" }, { - "name": "MYSQL_ROOT_PASSWORD", + "name": "DB_PASS", "value": "etherpad" + }, + { + "name": "DB_PORT", + "value": "3306" } ], "resources": {} @@ -148,23 +148,23 @@ "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "mariadb", + "name": "etherpad", "creationTimestamp": null, "labels": { - "service": "mariadb" + "service": "etherpad" } }, "spec": { "ports": [ { - "name": "3306", + "name": "80", "protocol": "TCP", - "port": 3306, - "targetPort": 3306 + "port": 80, + "targetPort": 9001 } ], "selector": { - "service": "mariadb" + "service": "etherpad" } }, "status": { diff --git a/script/test/fixtures/flask-redis/README.md b/script/test/fixtures/flask-redis/README.md deleted file mode 100644 index 0c6bb710c..000000000 --- a/script/test/fixtures/flask-redis/README.md +++ /dev/null @@ -1,10 +0,0 @@ -## Flask and Redis - -For running this app - - -```bash -mkdir /opt/redis -sudo chcon -Rt svirt_sandbox_file_t /opt/redis -docker-compose up -``` diff --git a/script/test/fixtures/flask-redis/docker-compose.yml b/script/test/fixtures/flask-redis/docker-compose.yml deleted file mode 100644 index 11e647dff..000000000 --- a/script/test/fixtures/flask-redis/docker-compose.yml +++ /dev/null @@ -1,20 +0,0 @@ -version: "2" - -services: - redis: - image: dharmit/redis - command: redis-server - ports: - - "6379" - volumes: - - /opt/redis:/redis - - flask: - image: dharmit/flask - ports: - - "31000:5000" - depends_on: - - redis - environment: - REDIS_PORT: 6379 - REDIS_HOST: redis diff --git a/script/test/fixtures/flask-redis/output-k8s.json b/script/test/fixtures/flask-redis/output-k8s.json deleted file mode 100644 index 10c86aece..000000000 --- a/script/test/fixtures/flask-redis/output-k8s.json +++ /dev/null @@ -1,159 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": {}, - "items": [ - { - "kind": "Deployment", - "apiVersion": "extensions/v1beta1", - "metadata": { - "name": "flask", - "creationTimestamp": null, - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "flask" - } - }, - "spec": { - "containers": [ - { - "name": "flask", - "image": "dharmit/flask", - "ports": [ - { - "containerPort": 5000, - "protocol": "TCP" - } - ], - "env": [ - { - "name": "REDIS_HOST", - "value": "redis" - }, - { - "name": "REDIS_PORT", - "value": "6379" - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "flask", - "creationTimestamp": null, - "labels": { - "service": "flask" - } - }, - "spec": { - "ports": [ - { - "name": "31000", - "protocol": "TCP", - "port": 31000, - "targetPort": 5000 - } - ], - "selector": { - "service": "flask" - } - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "Deployment", - "apiVersion": "extensions/v1beta1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "volumes": [ - { - "name": "fpllngzieyoh43e0133o", - "hostPath": { - "path": "/opt/redis" - } - } - ], - "containers": [ - { - "name": "redis", - "image": "dharmit/redis", - "ports": [ - { - "containerPort": 6379, - "protocol": "TCP" - } - ], - "resources": {}, - "volumeMounts": [ - { - "name": "fpllngzieyoh43e0133o", - "mountPath": "/redis" - } - ] - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "ports": [ - { - "name": "6379", - "protocol": "TCP", - "port": 6379, - "targetPort": 6379 - } - ], - "selector": { - "service": "redis" - } - }, - "status": { - "loadBalancer": {} - } - } - ] -} diff --git a/script/test/fixtures/flask-redis/output-os.json b/script/test/fixtures/flask-redis/output-os.json deleted file mode 100644 index 39af9ac67..000000000 --- a/script/test/fixtures/flask-redis/output-os.json +++ /dev/null @@ -1,179 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": {}, - "items": [ - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "flask", - "creationTimestamp": null, - "labels": { - "service": "flask" - } - }, - "spec": { - "strategy": { - "resources": {} - }, - "triggers": null, - "replicas": 1, - "test": false, - "selector": { - "service": "flask" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "flask" - } - }, - "spec": { - "containers": [ - { - "name": "flask", - "image": "dharmit/flask", - "ports": [ - { - "containerPort": 5000, - "protocol": "TCP" - } - ], - "env": [ - { - "name": "REDIS_HOST", - "value": "redis" - }, - { - "name": "REDIS_PORT", - "value": "6379" - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - } - }, - "status": {} - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "flask", - "creationTimestamp": null, - "labels": { - "service": "flask" - } - }, - "spec": { - "ports": [ - { - "name": "31000", - "protocol": "TCP", - "port": 31000, - "targetPort": 5000 - } - ], - "selector": { - "service": "flask" - } - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "strategy": { - "resources": {} - }, - "triggers": null, - "replicas": 1, - "test": false, - "selector": { - "service": "redis" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "volumes": [ - { - "name": "fpllngzieyoh43e0133o", - "hostPath": { - "path": "/opt/redis" - } - } - ], - "containers": [ - { - "name": "redis", - "image": "dharmit/redis", - "ports": [ - { - "containerPort": 6379, - "protocol": "TCP" - } - ], - "resources": {}, - "volumeMounts": [ - { - "name": "fpllngzieyoh43e0133o", - "mountPath": "/redis" - } - ] - } - ], - "restartPolicy": "Always" - } - } - }, - "status": {} - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "ports": [ - { - "name": "6379", - "protocol": "TCP", - "port": 6379, - "targetPort": 6379 - } - ], - "selector": { - "service": "redis" - } - }, - "status": { - "loadBalancer": {} - } - } - ] -} diff --git a/script/test/fixtures/gitlab/output-k8s.json b/script/test/fixtures/gitlab/output-k8s.json index 417b1f5a5..a506091fe 100644 --- a/script/test/fixtures/gitlab/output-k8s.json +++ b/script/test/fixtures/gitlab/output-k8s.json @@ -7,8 +7,8 @@ "kind": "Deployment", "apiVersion": "extensions/v1beta1", "metadata": { - "name": "gitlab", - "creationTimestamp": null, + "name": "postgresql", + "creationTimestamp": null }, "spec": { "replicas": 1, @@ -16,32 +16,24 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "gitlab" + "service": "postgresql" } }, "spec": { "containers": [ { - "name": "gitlab", - "image": "swordphilic/gitlab", + "name": "postgresql", + "image": "swordphilic/postgresql", "ports": [ { - "containerPort": 80, - "protocol": "TCP" - }, - { - "containerPort": 443, - "protocol": "TCP" - }, - { - "containerPort": 22, + "containerPort": 5432, "protocol": "TCP" } ], "env": [ { - "name": "DB_HOST", - "value": "postgresql" + "name": "DB_USER", + "value": "gitlab" }, { "name": "DB_NAME", @@ -50,26 +42,6 @@ { "name": "DB_PASS", "value": "gitlab" - }, - { - "name": "DB_PORT", - "value": "5432" - }, - { - "name": "DB_TYPE", - "value": "postgres" - }, - { - "name": "DB_USER", - "value": "gitlab" - }, - { - "name": "REDIS_HOST", - "value": "redis" - }, - { - "name": "REDIS_PORT", - "value": "6379" } ], "resources": {} @@ -86,35 +58,23 @@ "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "gitlab", + "name": "postgresql", "creationTimestamp": null, "labels": { - "service": "gitlab" + "service": "postgresql" } }, "spec": { "ports": [ { - "name": "30000", - "protocol": "TCP", - "port": 30000, - "targetPort": 80 - }, - { - "name": "30001", - "protocol": "TCP", - "port": 30001, - "targetPort": 443 - }, - { - "name": "30002", + "name": "5432", "protocol": "TCP", - "port": 30002, - "targetPort": 22 + "port": 5432, + "targetPort": 5432 } ], "selector": { - "service": "gitlab" + "service": "postgresql" } }, "status": { @@ -125,8 +85,8 @@ "kind": "Deployment", "apiVersion": "extensions/v1beta1", "metadata": { - "name": "postgresql", - "creationTimestamp": null, + "name": "redis", + "creationTimestamp": null }, "spec": { "replicas": 1, @@ -134,34 +94,20 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "postgresql" + "service": "redis" } }, "spec": { "containers": [ { - "name": "postgresql", - "image": "swordphilic/postgresql", + "name": "redis", + "image": "swordphilic/redis", "ports": [ { - "containerPort": 5432, + "containerPort": 6379, "protocol": "TCP" } ], - "env": [ - { - "name": "DB_PASS", - "value": "gitlab" - }, - { - "name": "DB_USER", - "value": "gitlab" - }, - { - "name": "DB_NAME", - "value": "gitlab" - } - ], "resources": {} } ], @@ -176,23 +122,23 @@ "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "postgresql", + "name": "redis", "creationTimestamp": null, "labels": { - "service": "postgresql" + "service": "redis" } }, "spec": { "ports": [ { - "name": "5432", + "name": "6379", "protocol": "TCP", - "port": 5432, - "targetPort": 5432 + "port": 6379, + "targetPort": 6379 } ], "selector": { - "service": "postgresql" + "service": "redis" } }, "status": { @@ -203,8 +149,8 @@ "kind": "Deployment", "apiVersion": "extensions/v1beta1", "metadata": { - "name": "redis", - "creationTimestamp": null, + "name": "gitlab", + "creationTimestamp": null }, "spec": { "replicas": 1, @@ -212,18 +158,60 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "service": "gitlab" } }, "spec": { "containers": [ { - "name": "redis", - "image": "swordphilic/redis", + "name": "gitlab", + "image": "swordphilic/gitlab", "ports": [ { - "containerPort": 6379, + "containerPort": 80, + "protocol": "TCP" + }, + { + "containerPort": 443, "protocol": "TCP" + }, + { + "containerPort": 22, + "protocol": "TCP" + } + ], + "env": [ + { + "name": "DB_TYPE", + "value": "postgres" + }, + { + "name": "DB_USER", + "value": "gitlab" + }, + { + "name": "REDIS_HOST", + "value": "redis" + }, + { + "name": "REDIS_PORT", + "value": "6379" + }, + { + "name": "DB_HOST", + "value": "postgresql" + }, + { + "name": "DB_NAME", + "value": "gitlab" + }, + { + "name": "DB_PASS", + "value": "gitlab" + }, + { + "name": "DB_PORT", + "value": "5432" } ], "resources": {} @@ -240,23 +228,35 @@ "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "redis", + "name": "gitlab", "creationTimestamp": null, "labels": { - "service": "redis" + "service": "gitlab" } }, "spec": { "ports": [ { - "name": "6379", + "name": "30000", "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "port": 30000, + "targetPort": 80 + }, + { + "name": "30001", + "protocol": "TCP", + "port": 30001, + "targetPort": 443 + }, + { + "name": "30002", + "protocol": "TCP", + "port": 30002, + "targetPort": 22 } ], "selector": { - "service": "redis" + "service": "gitlab" } }, "status": { diff --git a/script/test/fixtures/ngnix-node-redis/output-k8s.json b/script/test/fixtures/ngnix-node-redis/output-k8s.json index a8aa4e03b..60f6d4627 100644 --- a/script/test/fixtures/ngnix-node-redis/output-k8s.json +++ b/script/test/fixtures/ngnix-node-redis/output-k8s.json @@ -8,7 +8,7 @@ "apiVersion": "extensions/v1beta1", "metadata": { "name": "node2", - "creationTimestamp": null, + "creationTimestamp": null }, "spec": { "replicas": 1, @@ -71,7 +71,7 @@ "apiVersion": "extensions/v1beta1", "metadata": { "name": "node3", - "creationTimestamp": null, + "creationTimestamp": null }, "spec": { "replicas": 1, @@ -134,7 +134,7 @@ "apiVersion": "extensions/v1beta1", "metadata": { "name": "redis", - "creationTimestamp": null, + "creationTimestamp": null }, "spec": { "replicas": 1, @@ -198,7 +198,7 @@ "apiVersion": "extensions/v1beta1", "metadata": { "name": "nginx", - "creationTimestamp": null, + "creationTimestamp": null }, "spec": { "replicas": 1, @@ -261,7 +261,7 @@ "apiVersion": "extensions/v1beta1", "metadata": { "name": "node1", - "creationTimestamp": null, + "creationTimestamp": null }, "spec": { "replicas": 1, diff --git a/script/test/fixtures/wordpress/README.md b/script/test/fixtures/wordpress/README.md deleted file mode 100644 index 58dacca45..000000000 --- a/script/test/fixtures/wordpress/README.md +++ /dev/null @@ -1,14 +0,0 @@ -## Docker Compose Wordpress - -Wordpress and Mariadb - -### Usage - -The simplest thing to do: - -```bash -export $(cat envs) -docker-compose up -``` - -To customize the values edit `envs` file. diff --git a/script/test/fixtures/wordpress/docker-compose.yml b/script/test/fixtures/wordpress/docker-compose.yml deleted file mode 100644 index fd9fb7ec2..000000000 --- a/script/test/fixtures/wordpress/docker-compose.yml +++ /dev/null @@ -1,25 +0,0 @@ -version: "2" - -services: - mariadb: - image: centos/mariadb - ports: - - "$DB_PORT" - environment: - MYSQL_ROOT_PASSWORD: $ROOT_PASS - MYSQL_DATABASE: $DB_NAME - MYSQL_PASSWORD: $DB_PASS - MYSQL_USER: $DB_USER - - wordpress: - image: wordpress - ports: - - "8080:80" - depends_on: - - mariadb - restart: always - environment: - WORDPRESS_DB_HOST: $DB_HOST:$DB_PORT - WORDPRESS_DB_NAME: $DB_NAME - WORDPRESS_DB_PASSWORD: $DB_PASS - WORDPRESS_DB_USER: $DB_USER diff --git a/script/test/fixtures/wordpress/envs b/script/test/fixtures/wordpress/envs deleted file mode 100644 index aec230166..000000000 --- a/script/test/fixtures/wordpress/envs +++ /dev/null @@ -1,6 +0,0 @@ -DB_HOST=mariadb -ROOT_PASS=wordpress -DB_NAME=wordpress -DB_PASS=wordpress -DB_USER=wordpress -DB_PORT=3306 diff --git a/script/test/fixtures/wordpress/output-k8s.json b/script/test/fixtures/wordpress/output-k8s.json deleted file mode 100644 index 88579c6c8..000000000 --- a/script/test/fixtures/wordpress/output-k8s.json +++ /dev/null @@ -1,171 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": {}, - "items": [ - { - "kind": "Deployment", - "apiVersion": "extensions/v1beta1", - "metadata": { - "name": "mariadb", - "creationTimestamp": null, - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "mariadb" - } - }, - "spec": { - "containers": [ - { - "name": "mariadb", - "image": "centos/mariadb", - "ports": [ - { - "containerPort": 3306, - "protocol": "TCP" - } - ], - "env": [ - { - "name": "MYSQL_PASSWORD", - "value": "wordpress" - }, - { - "name": "MYSQL_ROOT_PASSWORD", - "value": "wordpress" - }, - { - "name": "MYSQL_USER", - "value": "wordpress" - }, - { - "name": "MYSQL_DATABASE", - "value": "wordpress" - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "mariadb", - "creationTimestamp": null, - "labels": { - "service": "mariadb" - } - }, - "spec": { - "ports": [ - { - "name": "3306", - "protocol": "TCP", - "port": 3306, - "targetPort": 3306 - } - ], - "selector": { - "service": "mariadb" - } - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "Deployment", - "apiVersion": "extensions/v1beta1", - "metadata": { - "name": "wordpress", - "creationTimestamp": null, - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "wordpress" - } - }, - "spec": { - "containers": [ - { - "name": "wordpress", - "image": "wordpress", - "ports": [ - { - "containerPort": 80, - "protocol": "TCP" - } - ], - "env": [ - { - "name": "WORDPRESS_DB_HOST", - "value": "mariadb:3306" - }, - { - "name": "WORDPRESS_DB_NAME", - "value": "wordpress" - }, - { - "name": "WORDPRESS_DB_PASSWORD", - "value": "wordpress" - }, - { - "name": "WORDPRESS_DB_USER", - "value": "wordpress" - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "wordpress", - "creationTimestamp": null, - "labels": { - "service": "wordpress" - } - }, - "spec": { - "ports": [ - { - "name": "8080", - "protocol": "TCP", - "port": 8080, - "targetPort": 80 - } - ], - "selector": { - "service": "wordpress" - } - }, - "status": { - "loadBalancer": {} - } - } - ] -} diff --git a/script/test/fixtures/wordpress/output-os.json b/script/test/fixtures/wordpress/output-os.json deleted file mode 100644 index 33a252fc4..000000000 --- a/script/test/fixtures/wordpress/output-os.json +++ /dev/null @@ -1,171 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": {}, - "items": [ - { - "kind": "Deployment", - "apiVersion": "extensions/v1beta1", - "metadata": { - "name": "mariadb", - "creationTimestamp": null, - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "mariadb" - } - }, - "spec": { - "containers": [ - { - "name": "mariadb", - "image": "centos/mariadb", - "ports": [ - { - "containerPort": 3306, - "protocol": "TCP" - } - ], - "env": [ - { - "name": "MYSQL_USER", - "value": "wordpress" - }, - { - "name": "MYSQL_DATABASE", - "value": "wordpress" - }, - { - "name": "MYSQL_PASSWORD", - "value": "wordpress" - }, - { - "name": "MYSQL_ROOT_PASSWORD", - "value": "wordpress" - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "mariadb", - "creationTimestamp": null, - "labels": { - "service": "mariadb" - } - }, - "spec": { - "ports": [ - { - "name": "3306", - "protocol": "TCP", - "port": 3306, - "targetPort": 3306 - } - ], - "selector": { - "service": "mariadb" - } - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "Deployment", - "apiVersion": "extensions/v1beta1", - "metadata": { - "name": "wordpress", - "creationTimestamp": null, - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "wordpress" - } - }, - "spec": { - "containers": [ - { - "name": "wordpress", - "image": "wordpress", - "ports": [ - { - "containerPort": 80, - "protocol": "TCP" - } - ], - "env": [ - { - "name": "WORDPRESS_DB_HOST", - "value": "mariadb:3306" - }, - { - "name": "WORDPRESS_DB_NAME", - "value": "wordpress" - }, - { - "name": "WORDPRESS_DB_PASSWORD", - "value": "wordpress" - }, - { - "name": "WORDPRESS_DB_USER", - "value": "wordpress" - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "wordpress", - "creationTimestamp": null, - "labels": { - "service": "wordpress" - } - }, - "spec": { - "ports": [ - { - "name": "8080", - "protocol": "TCP", - "port": 8080, - "targetPort": 80 - } - ], - "selector": { - "service": "wordpress" - } - }, - "status": { - "loadBalancer": {} - } - } - ] -}