add jwt fix

Author: spencerugbo

.github/workflows/ci.yml

@@ -366,7 +366,7 @@ jobs:
           CONTAINER_NGINX_IMAGE_REGISTRY="docker-registry.nginx.com" \
           TAG="${{ matrix.container.version }}-${{ matrix.container.image }}" \
           OS_RELEASE="${{ matrix.container.release }}" OS_VERSION="${{ matrix.container.version }}" \
-          make official-image-metrics-test | tee ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}-${{matrix.container.version}}/raw_logs.log
+          make metrics-test | tee ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}-${{matrix.container.version}}/raw_logs.log
           exit "${PIPESTATUS[0]}"
 
       - name: Format Results
@@ -434,7 +434,7 @@ jobs:
           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-metrics-test | tee ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}-${{matrix.container.version}}/raw_logs.log
+            make metrics-test | tee ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}-${{matrix.container.version}}/raw_logs.log
           exit "${PIPESTATUS[0]}"
 
       - name: Format Results

Makefile

@@ -179,7 +179,7 @@ official-image-integration-test: $(SELECTED_PACKAGE) build-mock-management-plane
 	OS_VERSION=$(OS_VERSION) OS_RELEASE=$(OS_RELEASE) IMAGE_PATH=$(IMAGE_PATH) \
 	go test -v ./test/integration/managementplane ./test/integration/auxiliarycommandserver
 
-official-image-metrics-test: $(SELECTED_PACKAGE) build-mock-management-otel-collector
+metrics-test: $(SELECTED_PACKAGE) build-mock-management-otel-collector
 	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) \

test/helpers/test_containers_utils.go

@@ -8,6 +8,7 @@ package helpers
 import (
 	"context"
 	"io"
+	"os"
 	"testing"
 
 	"github.com/docker/docker/api/types"
@@ -50,6 +51,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:       "../../../",
@@ -98,6 +107,7 @@ func StartContainer(
 				FileMode:          configFilePermissions,
 			},
 		},
+		Env: env,
 	}
 
 	container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{