update makefile

Author: salonichf5

.github/workflows/functional.yml

@@ -39,7 +39,7 @@ jobs:
     strategy:
         matrix:
           k8s-version: ["latest"]
-          nginx-image: [nginx-plus]
+          nginx-image: [nginx, nginx-plus]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -118,24 +118,18 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           pull: true
+          target: goreleaser
 
       - name: Build NGINX Docker Image
-        id: docker-nginx
         uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
         with:
-          file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || '' }}
-          context: "."
-          target: ${{ inputs.image == 'ngf' && 'goreleaser' || '' }}
+          file: build/Dockerfile${{ matrix.nginx-image == 'nginx' && '.nginx' || '' }}${{ matrix.nginx-image == 'nginx-plus' && '.nginxplus' || ''}}
           tags: ${{ steps.nginx-meta.outputs.tags }}
-          labels: ${{ steps.nginx-meta.outputs.labels }}
-          annotations: ${{ steps.nginx-meta.outputs.annotations }}
-          push: false
-          platforms: ${{ inputs.platforms }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          context: "."
           load: true
-          pull: false
-          no-cache: ${{ github.event_name != 'pull_request' }}
+          cache-from: type=gha,scope=${{ matrix.nginx-image }}
+          cache-to: type=gha,scope=${{ matrix.nginx-image }},mode=max
+          pull: true
           build-args: |
             NJS_DIR=internal/mode/static/nginx/modules/src
             NGINX_CONF_DIR=internal/mode/static/nginx/conf
@@ -151,6 +145,13 @@ jobs:
           make create-kind-cluster KIND_KUBE_CONFIG=${kube_config}
           echo "KUBECONFIG=${kube_config}" >> "$GITHUB_ENV"
 
+      - name: Wait for release to exist
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          REF=${{ github.ref_name }}
+          until docker pull ghcr.io/nginxinc/nginx-gateway-fabric:${REF#v}; do sleep 5; done
+          until docker pull ghcr.io/nginxinc/nginx-gateway-fabric/nginx:${REF#v}; do sleep 5; done
+
       - name: Setup functional tests
         id: setup
         run: |
@@ -160,7 +161,7 @@ jobs:
           make load-images${{ matrix.nginx-image == 'nginx-plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag}
         working-directory: ./tests
 
-      - name: Run NGINX functional tests
+      - name: Run functional tests
         run: |
           ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
           ngf_tag=${{ steps.ngf-meta.outputs.version }}

tests/Makefile

@@ -32,14 +32,6 @@ help: Makefile ## Display this help
 create-kind-cluster: ## Create a kind cluster
 	cd .. && make create-kind-cluster
 
-.PHONY: build-images
-build-images: ## Build NGF and NGINX images
-	cd .. && make PREFIX=$(PREFIX) TAG=$(TAG) build-images
-
-.PHONY: build-images-with-plus
-build-images-with-plus: ## Build NGF and NGINX Plus images
-	cd .. && make PREFIX=$(PREFIX) TAG=$(TAG) build-images-with-plus
-
 .PHONY: load-images
 load-images: ## Load NGF and NGINX images on configured kind cluster
 	cd .. && make PREFIX=$(PREFIX) TAG=$(TAG) load-images