From ec85012a8c65f21f20e0862dfaabce08ff8aa512 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Mon, 24 Apr 2017 09:44:57 +0530 Subject: [PATCH] typo in nginx name --- script/test/cmd/tests.sh | 6 +++--- .../{ngnix-node-redis => nginx-node-redis}/README.md | 0 .../docker-compose.yml | 0 .../nginx/Dockerfile | 0 .../nginx/nginx.conf | 0 .../node/Dockerfile | 0 .../node/index.js | 0 .../node/package.json | 0 .../node/test/dummyTest.js | 0 .../output-k8s.json | 0 .../output-os.json | 10 +++++----- 11 files changed, 8 insertions(+), 8 deletions(-) rename script/test/fixtures/{ngnix-node-redis => nginx-node-redis}/README.md (100%) rename script/test/fixtures/{ngnix-node-redis => nginx-node-redis}/docker-compose.yml (100%) rename script/test/fixtures/{ngnix-node-redis => nginx-node-redis}/nginx/Dockerfile (100%) rename script/test/fixtures/{ngnix-node-redis => nginx-node-redis}/nginx/nginx.conf (100%) rename script/test/fixtures/{ngnix-node-redis => nginx-node-redis}/node/Dockerfile (100%) rename script/test/fixtures/{ngnix-node-redis => nginx-node-redis}/node/index.js (100%) rename script/test/fixtures/{ngnix-node-redis => nginx-node-redis}/node/package.json (100%) rename script/test/fixtures/{ngnix-node-redis => nginx-node-redis}/node/test/dummyTest.js (100%) rename script/test/fixtures/{ngnix-node-redis => nginx-node-redis}/output-k8s.json (100%) rename script/test/fixtures/{ngnix-node-redis => nginx-node-redis}/output-os.json (98%) diff --git a/script/test/cmd/tests.sh b/script/test/cmd/tests.sh index 8337ec32..ef178438 100755 --- a/script/test/cmd/tests.sh +++ b/script/test/cmd/tests.sh @@ -41,11 +41,11 @@ convert::expect_success "kompose --provider=openshift -f $KOMPOSE_ROOT/script/te unset $(cat $KOMPOSE_ROOT/script/test/fixtures/gitlab/envs | cut -d'=' -f1) ###### -# Tests related to docker-compose file in /script/test/fixtures/ngnix-node-redis +# Tests related to docker-compose file in /script/test/fixtures/nginx-node-redis # kubernetes test -convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/docker-compose.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/output-k8s.json" "Kubernetes provider doesn't support build key - ignoring" +convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/docker-compose.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/output-k8s.json" "Kubernetes provider doesn't support build key - ignoring" # openshift test -convert::expect_success_and_warning "kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/docker-compose.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/output-os.json" "Buildconfig using https://github.com/kubernetes-incubator/kompose.git::HEAD as source." +convert::expect_success_and_warning "kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/docker-compose.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/output-os.json" "Buildconfig using https://github.com/kubernetes-incubator/kompose.git::HEAD as source." ###### # Tests related to docker-compose file in /script/test/fixtures/entrypoint-command diff --git a/script/test/fixtures/ngnix-node-redis/README.md b/script/test/fixtures/nginx-node-redis/README.md similarity index 100% rename from script/test/fixtures/ngnix-node-redis/README.md rename to script/test/fixtures/nginx-node-redis/README.md diff --git a/script/test/fixtures/ngnix-node-redis/docker-compose.yml b/script/test/fixtures/nginx-node-redis/docker-compose.yml similarity index 100% rename from script/test/fixtures/ngnix-node-redis/docker-compose.yml rename to script/test/fixtures/nginx-node-redis/docker-compose.yml diff --git a/script/test/fixtures/ngnix-node-redis/nginx/Dockerfile b/script/test/fixtures/nginx-node-redis/nginx/Dockerfile similarity index 100% rename from script/test/fixtures/ngnix-node-redis/nginx/Dockerfile rename to script/test/fixtures/nginx-node-redis/nginx/Dockerfile diff --git a/script/test/fixtures/ngnix-node-redis/nginx/nginx.conf b/script/test/fixtures/nginx-node-redis/nginx/nginx.conf similarity index 100% rename from script/test/fixtures/ngnix-node-redis/nginx/nginx.conf rename to script/test/fixtures/nginx-node-redis/nginx/nginx.conf diff --git a/script/test/fixtures/ngnix-node-redis/node/Dockerfile b/script/test/fixtures/nginx-node-redis/node/Dockerfile similarity index 100% rename from script/test/fixtures/ngnix-node-redis/node/Dockerfile rename to script/test/fixtures/nginx-node-redis/node/Dockerfile diff --git a/script/test/fixtures/ngnix-node-redis/node/index.js b/script/test/fixtures/nginx-node-redis/node/index.js similarity index 100% rename from script/test/fixtures/ngnix-node-redis/node/index.js rename to script/test/fixtures/nginx-node-redis/node/index.js diff --git a/script/test/fixtures/ngnix-node-redis/node/package.json b/script/test/fixtures/nginx-node-redis/node/package.json similarity index 100% rename from script/test/fixtures/ngnix-node-redis/node/package.json rename to script/test/fixtures/nginx-node-redis/node/package.json diff --git a/script/test/fixtures/ngnix-node-redis/node/test/dummyTest.js b/script/test/fixtures/nginx-node-redis/node/test/dummyTest.js similarity index 100% rename from script/test/fixtures/ngnix-node-redis/node/test/dummyTest.js rename to script/test/fixtures/nginx-node-redis/node/test/dummyTest.js diff --git a/script/test/fixtures/ngnix-node-redis/output-k8s.json b/script/test/fixtures/nginx-node-redis/output-k8s.json similarity index 100% rename from script/test/fixtures/ngnix-node-redis/output-k8s.json rename to script/test/fixtures/nginx-node-redis/output-k8s.json diff --git a/script/test/fixtures/ngnix-node-redis/output-os.json b/script/test/fixtures/nginx-node-redis/output-os.json similarity index 98% rename from script/test/fixtures/ngnix-node-redis/output-os.json rename to script/test/fixtures/nginx-node-redis/output-os.json index 23a6689f..ea99a205 100644 --- a/script/test/fixtures/ngnix-node-redis/output-os.json +++ b/script/test/fixtures/nginx-node-redis/output-os.json @@ -234,7 +234,7 @@ "uri": "https://github.com/kubernetes-incubator/kompose.git", "ref": "HEAD" }, - "contextDir": "script/test/fixtures/ngnix-node-redis/node" + "contextDir": "script/test/fixtures/nginx-node-redis/node" }, "strategy": { "type": "Docker", @@ -355,7 +355,7 @@ "uri": "https://github.com/kubernetes-incubator/kompose.git", "ref": "HEAD" }, - "contextDir": "script/test/fixtures/ngnix-node-redis/node" + "contextDir": "script/test/fixtures/nginx-node-redis/node" }, "strategy": { "type": "Docker", @@ -476,7 +476,7 @@ "uri": "https://github.com/kubernetes-incubator/kompose.git", "ref": "HEAD" }, - "contextDir": "script/test/fixtures/ngnix-node-redis/node" + "contextDir": "script/test/fixtures/nginx-node-redis/node" }, "strategy": { "type": "Docker", @@ -688,7 +688,7 @@ "uri": "https://github.com/kubernetes-incubator/kompose.git", "ref": "HEAD" }, - "contextDir": "script/test/fixtures/ngnix-node-redis/nginx" + "contextDir": "script/test/fixtures/nginx-node-redis/nginx" }, "strategy": { "type": "Docker", @@ -709,4 +709,4 @@ } } ] -} \ No newline at end of file +}