From 08f3105ed68bf8ce26078ade1a44499033a23fb5 Mon Sep 17 00:00:00 2001
From: Chris Sampson <chris.sampson82@gmail.com>
Date: Tue, 17 Oct 2023 19:54:47 +0100
Subject: [PATCH] Use Java Zulu distribution for all docker-tests and
 integration-tests Github Workflows

---
 .github/workflows/docker-tests.yml      | 15 ++-------------
 .github/workflows/integration-tests.yml | 16 ++++++----------
 .github/workflows/system-tests.yml      |  1 -
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/docker-tests.yml b/.github/workflows/docker-tests.yml
index 370d1590a24e..6e3495d778c2 100644
--- a/.github/workflows/docker-tests.yml
+++ b/.github/workflows/docker-tests.yml
@@ -29,7 +29,6 @@ on:
       - 'nifi-toolkit/nifi-toolkit-assembly/**'
       - 'nifi-toolkit/nifi-toolkit-cli/**'
       - 'nifi-toolkit/nifi-toolkit-encrypt-config/**'
-      - 'nifi-toolkit/nifi-toolkit-tls/**'
       - 'minifi/minifi-assembly/**'
       - 'minifi/minifi-docker/**'
       - 'minifi/minifi-c2/minifi-c2-assembly/**'
@@ -44,7 +43,6 @@ on:
       - 'nifi-toolkit/nifi-toolkit-assembly/**'
       - 'nifi-toolkit/nifi-toolkit-cli/**'
       - 'nifi-toolkit/nifi-toolkit-encrypt-config/**'
-      - 'nifi-toolkit/nifi-toolkit-tls/**'
       - 'minifi/minifi-assembly/**'
       - 'minifi/minifi-docker/**'
       - 'minifi/minifi-c2/minifi-c2-assembly/**'
@@ -87,7 +85,6 @@ env:
     -pl -nifi-toolkit/nifi-toolkit-assembly
     -pl -nifi-toolkit/nifi-toolkit-cli
     -pl -nifi-toolkit/nifi-toolkit-encrypt-config
-    -pl -nifi-toolkit/nifi-toolkit-tls
     -pl -minifi/minifi-assembly
     -pl -minifi/minifi-c2/minifi-c2-assembly
 
@@ -113,26 +110,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # TODO: macos-latest doesn't come with Docker and Colima seems to have problems with the nifi-docker integration_test scripts - see NIFI-12177/NIFI-12191
         os: [ ubuntu-latest ]
         version: [ 21 ]
     timeout-minutes: 120
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} Java ${{ matrix.version }}
-    env:
-      # default to Amazon Corretto JDK
-      JAVA_DISTRIBUTION: corretto
     steps:
-      # Zulu JDK appears to be more reliable for MacOS
-      - name: Use Java distribution Zulu
-        if: ${{ runner.os == 'macOS' }}
-        run: echo "JAVA_DISTRIBUTION=zulu" >> "$GITHUB_ENV"
       - name: Checkout Code
         uses: actions/checkout@v4
-      - name: Set up Java ${{ env.JAVA_DISTRIBUTION }} ${{ matrix.version }}
+      - name: Set up Java Zulu ${{ matrix.version }}
         uses: actions/setup-java@v3
         with:
-          distribution: ${{ env.JAVA_DISTRIBUTION }}
+          distribution: 'zulu'
           java-version: ${{ matrix.version }}
           cache: 'maven'
 
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 4dc9b524a49b..0581d21fc162 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -73,6 +73,10 @@ env:
     -pl -:nifi-system-test-suite
     -pl -:nifi-nar-provider-assembly
     -pl -:nifi-py4j-integration-tests
+    -pl -:nifi-docs
+    -pl -:nifi-maven-archetypes
+    -pl -:nifi-processor-bundle-archetype
+    -pl -:nifi-service-bundle-archetype
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -86,26 +90,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # TODO: macos-latest doesn't come with Docker and Colima seems to have problems with Test Containers - see NIFI-12191
         os: [ ubuntu-latest ]
         version: [ 21 ]
     timeout-minutes: 120
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} Java ${{ matrix.version }}
-    env:
-      # default to Amazon Corretto JDK
-      JAVA_DISTRIBUTION: corretto
     steps:
-      # Zulu JDK appears to be more reliable for MacOS
-      - name: Use Java distribution Zulu
-        if: ${{ runner.os == 'macOS' }}
-        run: echo "JAVA_DISTRIBUTION=zulu" >> "$GITHUB_ENV"
       - name: Checkout Code
         uses: actions/checkout@v4
-      - name: Set up Java ${{ env.JAVA_DISTRIBUTION }} ${{ matrix.version }}
+      - name: Set up Java Zulu ${{ matrix.version }}
         uses: actions/setup-java@v3
         with:
-          distribution: ${{ env.JAVA_DISTRIBUTION }}
+          distribution: 'zulu'
           java-version: ${{ matrix.version }}
           cache: 'maven'
 
diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml
index 11d162d5d0c1..e9c07148a9ca 100644
--- a/.github/workflows/system-tests.yml
+++ b/.github/workflows/system-tests.yml
@@ -53,7 +53,6 @@ env:
     -D skipTests
     -am
   MAVEN_RUN_ARGUMENTS: >-
-    package
     verify
     -P integration-tests
     -D include-python-integration-tests=true