This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 4ff4f77dd8 NIFI-12191 Simplified integration-tests and docker-tests
Workflows
4ff4f77dd8 is described below
commit 4ff4f77dd88af80254f4821fbe1396822f705b8e
Author: Chris Sampson <[email protected]>
AuthorDate: Sun Oct 15 17:29:11 2023 +0100
NIFI-12191 Simplified integration-tests and docker-tests Workflows
This closes #7920
Signed-off-by: David Handermann <[email protected]>
---
.github/workflows/docker-tests.yml | 25 ++++++-------------------
.github/workflows/integration-tests.yml | 28 +++++++---------------------
pom.xml | 9 +++++----
3 files changed, 18 insertions(+), 44 deletions(-)
diff --git a/.github/workflows/docker-tests.yml
b/.github/workflows/docker-tests.yml
index 6e3495d778..13fd9e961b 100644
--- a/.github/workflows/docker-tests.yml
+++ b/.github/workflows/docker-tests.yml
@@ -107,36 +107,23 @@ permissions:
jobs:
build_and_test:
- strategy:
- fail-fast: false
- matrix:
- os: [ ubuntu-latest ]
- version: [ 21 ]
timeout-minutes: 120
- runs-on: ${{ matrix.os }}
- name: ${{ matrix.os }} Java ${{ matrix.version }}
+ runs-on: ubuntu-latest
+ name: Ubuntu Java 21
steps:
- name: Checkout Code
uses: actions/checkout@v4
- - name: Set up Java Zulu ${{ matrix.version }}
+ - name: Set up Java Zulu 21
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: ${{ matrix.version }}
+ java-version: 21
cache: 'maven'
-
- - name: Set up Docker
- if: ${{ runner.os == 'macOS' }}
- run: |-
- /bin/bash -c "$(curl -fsSL
https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
- brew install docker
- colima start
-
- sudo ln -s ~/.colima/docker.sock /var/run/docker.sock
- name: System Information
run: |
hostname
- if [ "${{ runner.os }}" = "macOS" ]; then top -l 1 | grep PhysMem &&
sysctl machdep.cpu; else cat /proc/cpuinfo && cat /proc/meminfo; fi
+ cat /proc/cpuinfo
+ cat /proc/meminfo
df
docker info
diff --git a/.github/workflows/integration-tests.yml
b/.github/workflows/integration-tests.yml
index 0581d21fc1..9717970d4e 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -87,37 +87,23 @@ permissions:
jobs:
build_and_test:
- strategy:
- fail-fast: false
- matrix:
- os: [ ubuntu-latest ]
- version: [ 21 ]
timeout-minutes: 120
- runs-on: ${{ matrix.os }}
- name: ${{ matrix.os }} Java ${{ matrix.version }}
+ runs-on: ubuntu-latest
+ name: Ubuntu Java 21
steps:
- name: Checkout Code
uses: actions/checkout@v4
- - name: Set up Java Zulu ${{ matrix.version }}
+ - name: Set up Java Zulu 21
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: ${{ matrix.version }}
+ java-version: 21
cache: 'maven'
-
- # many integration-tests use Docker to run Testcontainers; MacOS doesn't
come with Docker, so we need to install it
- - name: Set up Docker
- if: ${{ runner.os == 'macOS' }}
- run: |-
- /bin/bash -c "$(curl -fsSL
https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
- brew install docker
- colima start
-
- sudo ln -s ~/.colima/docker.sock /var/run/docker.sock
- name: System Information
run: |
hostname
- if [ "${{ runner.os }}" = "macOS" ]; then top -l 1 | grep PhysMem &&
sysctl machdep.cpu; else cat /proc/cpuinfo && cat /proc/meminfo; fi
+ cat /proc/cpuinfo
+ cat /proc/meminfo
df
docker info
@@ -133,7 +119,7 @@ jobs:
if: failure() || cancelled()
uses: actions/upload-artifact@v3
with:
- name: ${{ matrix.os }}-${{ matrix.version }}-failsafe-logs
+ name: ubuntu-21-failsafe-logs
path: |
**/target/failsafe-reports/**/*.txt
retention-days: 7
diff --git a/pom.xml b/pom.xml
index de1374678a..d4be371f8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1089,6 +1089,7 @@
!ITestConsumeEmail#validateUrl,
!PrometheusReportingTaskIT#testNullLabel,
!SnowflakeConnectionPoolIT,
+ !SnowflakePipeIT,
!SalesforceRestServiceIT,
!QuerySalesforceObjectIT,
!PutSalesforceObjectIT,
@@ -1110,7 +1111,7 @@
!ITRedisDistributedMapCacheClientService#testSentinelRedisWithUsernameAndPasswordAuthentication,
!ITRedisDistributedMapCacheClientService#testStandaloneRedis,
!ITRedisDistributedMapCacheClientService#testStandaloneRedisWithAuthentication,
- !SnowflakePipeIT,
+ !SecureDatabaseIT,
!SecureFileIT,
!SecureProxyIT#testAccessStatus,
!SecureProxyIT#testAccessStatusAsProxiedAdmin,
@@ -1119,7 +1120,8 @@
!SecureNiFiRegistryClientIT#testTenantsClientGroups,
!SecureNiFiRegistryClientIT#testTenantsClientUsers,
!SecureNiFiRegistryClientIT#testCrudOperations,
- !SecureDatabaseIT,
+
!UnsecuredNiFiRegistryClientIT#testFlowSnapshotsWithParameterContextAndEncodingVersion,
+
!UnsecuredNiFiRegistryClientIT#testNiFiRegistryClient,
!ITConnectionAccessControl,
!ITLabelAccessControl,
!ITOutputPortAccessControl,
@@ -1132,8 +1134,7 @@
!ITPreventProxiedAnonymousAccess,
!ITPreventDirectAnonymousAccess,
!ITAllowDirectAnonymousAccess,
- !ITProcessGroupAccessControl,
-
!UnsecuredNiFiRegistryClientIT#testFlowSnapshotsWithParameterContextAndEncodingVersion
+ !ITProcessGroupAccessControl
</test>
</configuration>
</plugin>
