Merge pull request #241 from cncf/watson/#240-envoycleanup

Bugfix: microservice test doesn't clean up envoy
cnti-testcatalog · Jun 2, 2020 · 9560520 · 9560520
2 parents 295d9bf + 2022d2d
commit 9560520
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,9 +30,9 @@ jobs:
           fi
         # Download and install Crystal
         - sudo apt update && sudo apt install -y libevent-dev
-        - wget https://github.com/crystal-lang/crystal/releases/download/0.34.0/crystal-0.34.0-1-linux-x86_64.tar.gz
+        - wget https://github.com/crystal-lang/crystal/releases/download/0.33.0/crystal-0.33.0-1-linux-x86_64.tar.gz
         - tar -xvf crystal-*.tar.gz
-        - export PATH=$(pwd)/crystal-0.34.0-1/bin:$PATH
+        - export PATH=$(pwd)/crystal-0.33.0-1/bin:$PATH
         - crystal version
         # Download and install kubectl
         - curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/

diff --git a/shard.lock b/shard.lock
@@ -6,7 +6,7 @@ shards:
 
   halite:
     github: icyleaf/halite
-    version: 0.10.5
+    version: 0.10.4
 
   icr:
     github: crystal-community/icr

diff --git a/shard.yml b/shard.yml
@@ -21,7 +21,7 @@ dependencies:
     version: 0.6.0
   halite:
     github: icyleaf/halite
-    version: 0.10.5
+    version: 0.10.4
   icr:
     github: crystal-community/icr
     branch: master

diff --git a/spec/microservice_spec.cr b/spec/microservice_spec.cr
@@ -35,6 +35,8 @@ describe "Microservice" do
     ensure
       `kubectl delete -f sample-cnfs/sample_envoy_slow_startup/reasonable_startup_orig.yml`
       $?.success?.should be_true
+      `./cnf-conformance cnf_cleanup cnf-config=sample-cnfs/sample_envoy_slow_startup/cnf-conformance.yml force=true`
+      $?.success?.should be_true
     end
   end