[nifi] branch main updated: NIFI-9503: Fixed issue in system-tests

[exceptionfactory]

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 20392d5  NIFI-9503: Fixed issue in system-tests
20392d5 is described below

commit 20392d5ef417b71968ef1e8de553a45367e19f33
Author: Mark Payne <marka...@hotmail.com>
AuthorDate: Sat Dec 18 13:34:16 2021 -0500

    NIFI-9503: Fixed issue in system-tests
    
    - Fixed system-tests workflow so that troubleshooting info is always 
uploaded for failures
    
    This closes #5614
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 .github/workflows/system-tests.yml                  |  3 +++
 .../ControllerServiceApiValidationIT.java           | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/system-tests.yml 
b/.github/workflows/system-tests.yml
index 3ffa504..27dbefd 100644
--- a/.github/workflows/system-tests.yml
+++ b/.github/workflows/system-tests.yml
@@ -26,6 +26,7 @@ on:
       - 'nifi-framework-api/**'
       - 'nifi-nar-bundles/nifi-framework-bundle/**'
       - 'nifi-system-tests/**'
+      - 'nifi-stateless/**'
 
 env:
   DEFAULT_MAVEN_OPTS: >-
@@ -89,6 +90,7 @@ jobs:
           ${{ env.MAVEN_RUN_ARGUMENTS }}
           ${{ env.MAVEN_PROJECTS }}
       - name: Upload Troubleshooting Logs
+        if: ${{ failure() }}
         uses: actions/upload-artifact@v2
         with:
           name: ubuntu-latest-troubleshooting-logs
@@ -132,6 +134,7 @@ jobs:
           ${{ env.MAVEN_RUN_ARGUMENTS }}
           ${{ env.MAVEN_PROJECTS }}
       - name: Upload Troubleshooting Logs
+        if: ${{ failure() }}
         uses: actions/upload-artifact@v2
         with:
           name: macos-latest-troubleshooting-logs
diff --git 
a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/controllerservice/ControllerServiceApiValidationIT.java
 
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/controllerservice/ControllerServiceApiValidationIT.java
index 26cb595..7f6f5ce 100644
--- 
a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/controllerservice/ControllerServiceApiValidationIT.java
+++ 
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/controllerservice/ControllerServiceApiValidationIT.java
@@ -87,26 +87,27 @@ public class ControllerServiceApiValidationIT extends 
NiFiSystemIT {
     }
 
     @Test
-    public void testNonMatchingDynamicPropertyControllerService() throws 
NiFiClientException, IOException {
-        final ControllerServiceEntity fakeServiceEntity = 
getClientUtil().createControllerService(
+    public void testNonMatchingDynamicPropertyControllerService() throws 
NiFiClientException, IOException, InterruptedException {
+        final ControllerServiceEntity controllerService = 
getClientUtil().createControllerService(
                 NiFiSystemIT.TEST_CS_PACKAGE + ".FakeControllerService2",
                 "root",
                 NiFiSystemIT.NIFI_GROUP_ID,
                 "nifi-system-test-extensions2-nar",
                 getNiFiVersion());
-        final ProcessorEntity fakeProcessorEntity = 
getClientUtil().createProcessor("FakeDynamicPropertiesProcessor");
-        
fakeProcessorEntity.getComponent().getConfig().setProperties(Collections.singletonMap("FCS.fakeControllerService",
 fakeServiceEntity.getId()));
-        
getNifiClient().getProcessorClient().updateProcessor(fakeProcessorEntity);
+
+        final ProcessorEntity processor = 
getClientUtil().createProcessor("FakeDynamicPropertiesProcessor");
+        
processor.getComponent().getConfig().setProperties(Collections.singletonMap("FCS.fakeControllerService",
 controllerService.getId()));
+        getNifiClient().getProcessorClient().updateProcessor(processor);
         final ControllerServiceRunStatusEntity runStatusEntity = new 
ControllerServiceRunStatusEntity();
         runStatusEntity.setState("ENABLED");
-        runStatusEntity.setRevision(fakeServiceEntity.getRevision());
-        
getNifiClient().getControllerServicesClient().activateControllerService(fakeServiceEntity.getId(),
 runStatusEntity);
+        runStatusEntity.setRevision(controllerService.getRevision());
+        
getNifiClient().getControllerServicesClient().activateControllerService(controllerService.getId(),
 runStatusEntity);
         getClientUtil().waitForControllerSerivcesEnabled("root");
-        String controllerStatus = 
getNifiClient().getControllerServicesClient().getControllerService(fakeServiceEntity.getId()).getStatus().getRunStatus();
-        String processorStatus = 
getNifiClient().getProcessorClient().getProcessor(fakeProcessorEntity.getId()).getStatus().getRunStatus();
 
+        final String controllerStatus = 
getNifiClient().getControllerServicesClient().getControllerService(controllerService.getId()).getStatus().getRunStatus();
         assertEquals("ENABLED", controllerStatus);
-        assertEquals("Invalid", processorStatus);
+
+        getClientUtil().waitForInvalidProcessor(processor.getId());
     }
 
     @Test