Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <exceptionfactory@apache.org>
This commit is contained in:
Mark Payne 2021-12-18 13:34:16 -05:00 committed by exceptionfactory
parent 66f36eaf5a
commit 20392d5ef4
No known key found for this signature in database
GPG Key ID: 29B6A52D2AAE8DBA
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/system-tests.yml vendored
View File

@ -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

21
nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/controllerservice/ControllerServiceApiValidationIT.java
View File

@ -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