Update NGINX Plus in Integration Tests (#1212)

* update nginx plus in workflow

* update protoc version

* fix docker registry login

* fix plus version in container matrix

* test plus version as variable

* fix for setting plus version

* use JWT for authentication

* add jwt as env variable

* cleanup

* cleanup

* fix jwt env name

* add jwt license to container

* properly pass variable from host to container

* small change to run command

* cleanup

* added jwt variable to makefile command

* add environment variable definition to workflow

* add jwt to directory in container

* add debug log

* test other plus versions

* test plus r34

* add debug log

* cleanup

* add jwt definition to makefile

* cleanup

* fix container matrix

* Update ci.yml

* Update ci.yml

* Update ci.yml

* Update ci.yml

* update makefile

* use jwt to login

* revert login

* cleanup

* test working JWT

* test with v3

* add debian image back to test

* add prefix to image tags

* test only debian images

* change used registry

* Update ci.yml

Author: spencerugbo

.github/workflows/ci.yml

@@ -262,23 +262,23 @@ jobs:
       matrix:
         container:
         - image: "alpine"
-          version: "3.20"
-          plus: "r32"
+          version: "3.22"
+          plus: "r35"
           release: "alpine"
           path: "/nginx-plus/agent"
         - image: "alpine"
-          version: "3.19"
-          plus: "r31"
+          version: "3.21"
+          plus: "r34"
           release: "alpine"
           path: "/nginx-plus/agent"
         - image: "debian"
           version: "bookworm"
-          plus: "r32"
+          plus: "r35"
           release: "debian"
           path: "/nginx-plus/agent"
         - image: "debian"
           version: "bookworm"
-          plus: "r31"
+          plus: "r34"
           release: "debian"
           path: "/nginx-plus/agent"
     steps:
@@ -295,7 +295,7 @@ jobs:
       - name: Login to Docker Registry
         uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
         with:
-          registry: ${{ secrets.REGISTRY_URL }}
+          registry: ${{ secrets.TEST_REGISTRY_URL }}
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
@@ -310,9 +310,10 @@ jobs:
       - name: Run Integration Tests
         run: |
           go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
-          CONTAINER_NGINX_IMAGE_REGISTRY="${{ secrets.REGISTRY_URL }}" \
+          CONTAINER_NGINX_IMAGE_REGISTRY="${{ secrets.TEST_REGISTRY_URL }}" \
           TAG="${{ matrix.container.plus }}-${{ matrix.container.image }}-${{ matrix.container.version }}" \
           OS_RELEASE="${{ matrix.container.release }}" OS_VERSION="${{ matrix.container.version }}" IMAGE_PATH="${{ matrix.container.path }}" \
+          NGINX_LICENSE_JWT='${{ secrets.TEST_JWT }}' \
             make official-image-integration-test | tee ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}-${{matrix.container.version}}/raw_logs.log
           exit "${PIPESTATUS[0]}"
 

Makefile

@@ -34,6 +34,7 @@ DOCKERFILE_PATH = "./test/docker/nginx-oss/$(CONTAINER_OS_TYPE)/Dockerfile"
 OFFICIAL_IMAGE_DOCKERFILE_PATH = "./test/docker/nginx-official-image/$(CONTAINER_OS_TYPE)/Dockerfile"
 IMAGE_PATH ?= "/nginx/agent"
 TAG ?= ""
+NGINX_LICENSE_JWT ?= ""
 
 BUILD_DIR		:= build
 TEST_BUILD_DIR  := build/test
@@ -177,6 +178,7 @@ official-image-integration-test: $(SELECTED_PACKAGE) build-mock-management-plane
 	TEST_ENV="Container" CONTAINER_OS_TYPE=$(CONTAINER_OS_TYPE) CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} BUILD_TARGET="install" \
 	PACKAGES_REPO=$(OSS_PACKAGES_REPO) TAG=${TAG} PACKAGE_NAME=$(PACKAGE_NAME) BASE_IMAGE=$(BASE_IMAGE) DOCKERFILE_PATH=$(OFFICIAL_IMAGE_DOCKERFILE_PATH) \
 	OS_VERSION=$(OS_VERSION) OS_RELEASE=$(OS_RELEASE) IMAGE_PATH=$(IMAGE_PATH) \
+	NGINX_LICENSE_JWT=$(NGINX_LICENSE_JWT) \
 	go test -v ./test/integration/managementplane ./test/integration/auxiliarycommandserver
 
 performance-test:

test/helpers/test_containers_utils.go

@@ -8,6 +8,7 @@ package helpers
 import (
 	"context"
 	"io"
+	"os"
 	"testing"
 
 	"github.com/docker/docker/api/types"
@@ -44,6 +45,14 @@ func StartContainer(
 	tag := Env(tb, "TAG")
 	imagePath := Env(tb, "IMAGE_PATH")
 
+	var env map[string]string
+	if os.Getenv("NGINX_LICENSE_JWT") != "" {
+		nginxLicenseJwt := os.Getenv("NGINX_LICENSE_JWT")
+		env = map[string]string{
+			"NGINX_LICENSE_JWT": nginxLicenseJwt,
+		}
+	}
+
 	req := testcontainers.ContainerRequest{
 		FromDockerfile: testcontainers.FromDockerfile{
 			Context:       "../../../",
@@ -92,6 +101,7 @@ func StartContainer(
 				FileMode:          configFilePermissions,
 			},
 		},
+		Env: env,
 	}
 
 	container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{