Revert "tests(plugins/rate-limiting) test ssl connection (#8617)"

This reverts commit e1ace9d.
Kong · Apr 7, 2022 · 4ba2a37 · 4ba2a37
1 parent e1ace9d
commit 4ba2a37
Show file tree

Hide file tree

Showing 11 changed files with 1,333 additions and 1,656 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -149,19 +149,17 @@ jobs:
           - 15002:9000
           - 15003:9001
 
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+        options: --entrypoint redis-server
+
       zipkin:
         image: openzipkin/zipkin:2.19
         ports:
           - 9411:9411
 
-      redis:
-        image: redis:6.2.6-alpine
-        ports:
-          - 6379:6379
-          - 6380:6380
-        options: >-
-          --name kong_redis
-
     steps:
     - name: Set environment variables
       run: |
@@ -187,13 +185,6 @@ jobs:
           echo "127.0.0.1 grpcs_1.test" | sudo tee -a /etc/hosts
           echo "127.0.0.1 grpcs_2.test" | sudo tee -a /etc/hosts
 
-    - name: Enable SSL for Redis
-      run: |
-          docker cp ${{ github.workspace }} kong_redis:/workspace
-          docker cp ${{ github.workspace }}/spec/fixtures/redis/docker-entrypoint.sh kong_redis:/usr/local/bin/docker-entrypoint.sh
-          docker restart kong_redis
-          docker logs kong_redis
-
     - name: Tests
       run: |
           eval `luarocks path`
@@ -281,19 +272,17 @@ jobs:
           - 15002:9000
           - 15003:9001
 
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+        options: --entrypoint redis-server
+
       zipkin:
         image: openzipkin/zipkin:2.19
         ports:
           - 9411:9411
 
-      redis:
-        image: redis:6.2.6-alpine
-        ports:
-          - 6379:6379
-          - 6380:6380
-        options: >-
-          --name kong_redis
-
     steps:
     - name: Set environment variables
       run: |
@@ -318,13 +307,6 @@ jobs:
       run: |
           echo "127.0.0.1 grpcs_1.test" | sudo tee -a /etc/hosts
           echo "127.0.0.1 grpcs_2.test" | sudo tee -a /etc/hosts
-    
-    - name: Enable SSL for Redis
-      run: |
-          docker cp ${{ github.workspace }} kong_redis:/workspace
-          docker cp ${{ github.workspace }}/spec/fixtures/redis/docker-entrypoint.sh kong_redis:/usr/local/bin/docker-entrypoint.sh
-          docker restart kong_redis
-          docker logs kong_redis
 
     - name: Tests
       run: |