Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Apr 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 12 additions & 30 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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`
Expand Down Expand Up @@ -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: |
Expand All @@ -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: |
Expand Down
Loading