From 5de7b2c7593246d00ab0b63d57518a877bc884ae Mon Sep 17 00:00:00 2001 From: Travis Raines <571832+rainest@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:25:14 -0500 Subject: [PATCH] chore: add versions, add Enterprise, clean targets --- .github/workflows/integration-enterprise.yaml | 64 +++++++++++++++++++ .github/workflows/integration.yaml | 2 + Makefile | 5 +- 3 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/integration-enterprise.yaml diff --git a/.github/workflows/integration-enterprise.yaml b/.github/workflows/integration-enterprise.yaml new file mode 100644 index 0000000..d2380dc --- /dev/null +++ b/.github/workflows/integration-enterprise.yaml @@ -0,0 +1,64 @@ +name: Enterprise Integration Test + +concurrency: + # Run only for most recent commit in PRs but for all tags and commits on main + # Ref: https://docs.github.com/en/actions/using-jobs/using-concurrency + group: ${{ github.workflow }}-${{ github.head_ref || github.sha }} + cancel-in-progress: true + +on: + push: + branches: + - main + pull_request: {} + +jobs: + integration: + strategy: + matrix: + kong_image: + - 'kong/kong-gateway:1.5.0.11' + - 'kong/kong-gateway:2.1.4.6' + - 'kong/kong-gateway:2.2.1.3' + - 'kong/kong-gateway:2.3.3.4' + - 'kong/kong-gateway:2.4.1.3' + - 'kong/kong-gateway:2.5.1.2' + - 'kong/kong-gateway:2.6.0.2' + - 'kong/kong-gateway:2.7' + - 'kong/kong-gateway:2.8' + - 'kong/kong-gateway:3.0' + - 'kong/kong-gateway:3.1' + - 'kong/kong-gateway:3.2' + - 'kong/kong-gateway:3.3' + - 'kong/kong-gateway:3.4' + - 'kong/kong-gateway:3.5' + - 'kong/kong-gateway-dev:latest' + env: + KONG_ANONYMOUS_REPORTS: "off" + KONG_IMAGE: ${{ matrix.kong_image }} + + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Setup go + uses: actions/setup-go@v4 + with: + go-version: '^1.20' + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{secrets.DOCKERHUB_PULL_USERNAME}} + password: ${{secrets.DOCKERHUB_PULL_TOKEN}} + - uses: Kong/kong-license@master + id: license + with: + password: ${{ secrets.PULP_PASSWORD }} + - name: Setup Kong + env: + KONG_LICENSE_DATA: ${{ steps.license.outputs.license }} + run: make setup-kong-ee + - name: Run integration tests + env: + KONG_LICENSE_DATA: ${{ steps.license.outputs.license }} + run: make test-integration diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 281c8d6..dd0d7b2 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -33,6 +33,8 @@ jobs: - 'kong:3.1' - 'kong:3.2' - 'kong:3.3' + - 'kong:3.4' + - 'kong:3.5' - 'kong/kong:master-alpine' env: KONG_ANONYMOUS_REPORTS: "off" diff --git a/Makefile b/Makefile index d3b4e53..908e8c6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,3 @@ -.DEFAULT_GOAL := test-all - -CLI_DOCS_PATH=docs/cli-docs/ .PHONY: test-all test-all: lint test @@ -49,4 +46,4 @@ setup-kong-ee: test-integration: go test -v -count=1 -tags=integration \ -race \ - ./tests/integration/... \ No newline at end of file + ./tests/integration/...