Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

user story #2456007: [Jenkins plugin] unit to runner keep backward compatibility #224

Merged
merged 4 commits into from
Apr 11, 2024
Merged

user story #2456007: [Jenkins plugin] unit to runner keep backward compatibility #224

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42e1aec
user story #2402015: [Jenkins plugins] - Exit MBT in case of unit fail
mayarfl Mar 25, 2024
b2824de
user story #2402015: [Jenkins plugins] - Exit MBT in case of unit fail
mayarfl Apr 10, 2024
427d28c
user story #2402015: [Jenkins plugins] - Exit MBT in case of unit fail
mayarfl Apr 11, 2024
dce8150
user story #2402015: [Jenkins plugins] - Exit MBT in case of unit fail
mayarfl Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 24 additions & 42 deletions ...ns-sdk/src/main/java/com/hp/octane/integrations/uft/MbtDiscoveryResultDispatcherImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import java.util.function.Function;
import java.util.stream.Collectors;

import static com.hp.octane.integrations.utils.MbtDiscoveryResultHelper.isUnitToRunnerRelationDefined;
import static com.hp.octane.integrations.utils.MbtDiscoveryResultHelper.*;

/**
* @author Itay Karo on 26/08/2021
Expand All @@ -33,8 +33,6 @@ public class MbtDiscoveryResultDispatcherImpl extends DiscoveryResultDispatcher

private static final Entity OUTPUT_PARAMETER_TYPE = createListNodeEntity("list_node.entity_parameter_type.output");

private boolean bUnitToRunner;

@Override
public void dispatchDiscoveryResults(EntitiesService entitiesService, UftTestDiscoveryResult result, JobRunContext jobRunContext, CustomLogger customLogger) {
List<UftTestAction> allActions = result.getAllTests().stream()
Expand All @@ -49,37 +47,29 @@ public void dispatchDiscoveryResults(EntitiesService entitiesService, UftTestDis
Map<OctaneStatus, List<UftTestAction>> actionsByStatusMap = allActions.stream().collect(Collectors.groupingBy(UftTestAction::getOctaneStatus));
Entity autoDiscoveredFolder = null;

bUnitToRunner = isUnitToRunnerRelationDefined(entitiesService, workspaceId);
boolean unitToRunnerEnabled = SdkStringUtils.isNotEmpty(runnerId) && isUnitToRunnerRelationDefined(entitiesService, workspaceId) && isNewRunner(entitiesService, workspaceId, runnerId);
if (CollectionUtils.isNotEmpty(actionsByStatusMap.get(OctaneStatus.NEW)) || CollectionUtils.isNotEmpty(actionsByStatusMap.get(OctaneStatus.MODIFIED))) {
Long lRunnerId;

try {
lRunnerId = Long.parseLong(runnerId);
} catch (NumberFormatException nfe) {
lRunnerId = null;
}

if (!bUnitToRunner || lRunnerId == null) {
autoDiscoveredFolder = getGitMirrorFolder(entitiesService, workspaceId);
if (unitToRunnerEnabled) {
autoDiscoveredFolder = retrieveParentFolder(entitiesService, workspaceId, runnerId);
} else {
autoDiscoveredFolder = retrieveParentFolder(entitiesService, workspaceId, lRunnerId);
autoDiscoveredFolder = getGitMirrorFolder(entitiesService, workspaceId);
}
}

// handle new actions- create new units and parameters in octane
dispatchNewActions(entitiesService, actionsByStatusMap.get(OctaneStatus.NEW), autoDiscoveredFolder, workspaceId, runnerId, scmRepositoryId, customLogger);
dispatchNewActions(entitiesService, actionsByStatusMap.get(OctaneStatus.NEW), autoDiscoveredFolder, workspaceId, runnerId, scmRepositoryId, unitToRunnerEnabled, customLogger);

// handle deleted actions- currently do nothing
dispatchDeletedActions(entitiesService, actionsByStatusMap.get(OctaneStatus.DELETED), workspaceId, customLogger);
dispatchDeletedActions(entitiesService, actionsByStatusMap.get(OctaneStatus.DELETED), workspaceId, unitToRunnerEnabled, customLogger);

// handle updated actions- update units in octane
dispatchUpdatedActions(entitiesService, actionsByStatusMap.get(OctaneStatus.MODIFIED), autoDiscoveredFolder, workspaceId, runnerId, scmRepositoryId, customLogger);
dispatchUpdatedActions(entitiesService, actionsByStatusMap.get(OctaneStatus.MODIFIED), autoDiscoveredFolder, workspaceId, runnerId, scmRepositoryId, unitToRunnerEnabled, customLogger);
}

private void dispatchNewActions(EntitiesService entitiesService, List<UftTestAction> newActions, Entity autoDiscoveredFolder, long workspaceId, String runnerId, String scmRepositoryId, CustomLogger customLogger) {
private void dispatchNewActions(EntitiesService entitiesService, List<UftTestAction> newActions, Entity autoDiscoveredFolder, long workspaceId, String runnerId, String scmRepositoryId, boolean unitToRunnerEnabled, CustomLogger customLogger) {
if (CollectionUtils.isNotEmpty(newActions)) {
Map<String, Entity> foldersMap = createParentFolders(entitiesService, newActions, autoDiscoveredFolder, workspaceId);
postUnits(entitiesService, newActions, foldersMap, workspaceId, runnerId, scmRepositoryId);
postUnits(entitiesService, newActions, foldersMap, workspaceId, runnerId, scmRepositoryId, unitToRunnerEnabled);
}
}

Expand All @@ -99,16 +89,16 @@ private Map<String, Entity> createParentFolders(EntitiesService entitiesService,
return existingSubFoldersMap;
}

private void dispatchDeletedActions(EntitiesService entitiesService, List<UftTestAction> deletedActions, long workspaceId, CustomLogger customLogger) {
private void dispatchDeletedActions(EntitiesService entitiesService, List<UftTestAction> deletedActions, long workspaceId, boolean unitToRunnerEnabled, CustomLogger customLogger) {
if (CollectionUtils.isNotEmpty(deletedActions)) {
deleteUnits(entitiesService, deletedActions, workspaceId);
deleteUnits(entitiesService, deletedActions, workspaceId, unitToRunnerEnabled);
}
}

private void dispatchUpdatedActions(EntitiesService entitiesService, List<UftTestAction> updatedActions, Entity autoDiscoveredFolder, long workspaceId, String runnerId, String scmRepositoryId, CustomLogger customLogger) {
private void dispatchUpdatedActions(EntitiesService entitiesService, List<UftTestAction> updatedActions, Entity autoDiscoveredFolder, long workspaceId, String runnerId, String scmRepositoryId, boolean unitToRunnerEnabled, CustomLogger customLogger) {
if (CollectionUtils.isNotEmpty(updatedActions)) {
updateParentFolders(entitiesService, updatedActions, autoDiscoveredFolder, workspaceId);
updateUnits(entitiesService, updatedActions, workspaceId, runnerId, scmRepositoryId);
updateUnits(entitiesService, updatedActions, workspaceId, runnerId, scmRepositoryId, unitToRunnerEnabled);
}
}

Expand Down Expand Up @@ -155,13 +145,13 @@ private void updateFolders(EntitiesService entitiesService, List<Entity> folders
}
}

private boolean postUnits(EntitiesService entitiesService, List<UftTestAction> actions, Map<String, Entity> foldersMap, long workspaceId, String runnerId, String scmRepositoryId) {
private boolean postUnits(EntitiesService entitiesService, List<UftTestAction> actions, Map<String, Entity> foldersMap, long workspaceId, String runnerId, String scmRepositoryId, boolean unitToRunnerEnabled) {
if (!actions.isEmpty()) {
logger.info("dispatching {} new units", actions.size());

List<Entity> parameterToAdd = new ArrayList<>(); // add external parameter entities list to be filled by each action creation
// add units
List<Entity> unitsToAdd = actions.stream().map(action -> createUnitEntity(action, foldersMap, parameterToAdd, runnerId, scmRepositoryId)).collect(Collectors.toList());
List<Entity> unitsToAdd = actions.stream().map(action -> createUnitEntity(action, foldersMap, parameterToAdd, runnerId, scmRepositoryId, unitToRunnerEnabled)).collect(Collectors.toList());
Map<String, Entity> unitEntities = entitiesService.postEntities(workspaceId, EntityConstants.MbtUnit.COLLECTION_NAME, unitsToAdd, Collections.singletonList(EntityConstants.MbtUnit.REPOSITORY_PATH_FIELD)).stream()
.collect(Collectors.toMap(entity -> entity.getField(EntityConstants.MbtUnit.REPOSITORY_PATH_FIELD).toString(), Function.identity()));

Expand All @@ -183,7 +173,7 @@ private boolean postUnits(EntitiesService entitiesService, List<UftTestAction> a
}

// we do not delete units. instead, we reset some of their attributes
private boolean deleteUnits(EntitiesService entitiesService, List<UftTestAction> actions, long workspaceId) {
private boolean deleteUnits(EntitiesService entitiesService, List<UftTestAction> actions, long workspaceId, boolean unitToRunnerEnabled) {
if (!actions.isEmpty()) {
logger.info("dispatching {} deleted units", actions.size());
// convert actions to dtos
Expand All @@ -194,7 +184,7 @@ private boolean deleteUnits(EntitiesService entitiesService, List<UftTestAction>
.setField(EntityConstants.MbtUnit.REPOSITORY_PATH_FIELD, null)
.setField(EntityConstants.MbtUnit.AUTOMATION_STATUS_FIELD, NOT_AUTOMATED_AUTOMATION_STATUS);

if (bUnitToRunner) {
if (unitToRunnerEnabled) {
unitToUpdate.setField(EntityConstants.MbtUnit.SCM_REPOSITORY_FIELD, null)
.setField(EntityConstants.MbtUnit.TEST_RUNNER_FIELD, null);
} else {
Expand All @@ -212,7 +202,7 @@ private boolean deleteUnits(EntitiesService entitiesService, List<UftTestAction>
return true;
}

private boolean updateUnits(EntitiesService entitiesService, List<UftTestAction> actions, long workspaceId, String runnerId, String scmRepositoryId) {
private boolean updateUnits(EntitiesService entitiesService, List<UftTestAction> actions, long workspaceId, String runnerId, String scmRepositoryId, boolean unitToRunnerEnabled) {
if (!actions.isEmpty()) {
logger.info("dispatching {} updated units", actions.size());

Expand All @@ -228,7 +218,7 @@ private boolean updateUnits(EntitiesService entitiesService, List<UftTestAction>
.setField(EntityConstants.MbtUnit.DESCRIPTION_FIELD, action.getDescription())
.setField(EntityConstants.MbtUnit.REPOSITORY_PATH_FIELD, action.getRepositoryPath());

if (bUnitToRunner) {
if (unitToRunnerEnabled) {
unitToUpdate.setField(EntityConstants.MbtUnit.SCM_REPOSITORY_FIELD, scmRepository)
.setField(EntityConstants.MbtUnit.TEST_RUNNER_FIELD, testRunner);
}
Expand All @@ -244,8 +234,8 @@ private boolean updateUnits(EntitiesService entitiesService, List<UftTestAction>
return true;
}

public Entity retrieveParentFolder(EntitiesService entitiesService, long workspaceId, long executorId) {
Entity autoDiscoveredFolder = getRunnerDedicatedFolder(entitiesService, workspaceId, executorId);
public Entity retrieveParentFolder(EntitiesService entitiesService, long workspaceId, String runnerId) {
Entity autoDiscoveredFolder = getRunnerDedicatedFolder(entitiesService, workspaceId, runnerId);

if (autoDiscoveredFolder == null) {
// backward compatibility for previously created cloud runners, that have no dedicated folder
Expand All @@ -255,14 +245,6 @@ public Entity retrieveParentFolder(EntitiesService entitiesService, long workspa
return autoDiscoveredFolder;
}

private Entity getRunnerDedicatedFolder(EntitiesService entitiesService, long workspaceId, long executorId) {
String condition1 = QueryHelper.conditionRef(EntityConstants.ModelFolder.TEST_RUNNER_FIELD, executorId);
String condition2 = QueryHelper.condition(EntityConstants.ModelFolder.SUBTYPE_FIELD, EntityConstants.ModelFolder.ENTITY_SUBTYPE);

List<Entity> entities = entitiesService.getEntities(workspaceId, EntityConstants.ModelFolder.COLLECTION_NAME, Arrays.asList(condition1, condition2), Collections.emptyList());
return entities.stream().findFirst().orElse(null);
}

private Entity getGitMirrorFolder(EntitiesService entitiesService, long workspaceId) {
String condition = QueryHelper.condition(EntityConstants.ModelFolder.LOGICAL_NAME, "mbt.discovery.unit.default_folder_name");

Expand All @@ -285,7 +267,7 @@ private Entity createFolderEntity(String name, Entity parentFolder) {
.setField(EntityConstants.ModelFolder.PARENT, parentFolder);
}

private Entity createUnitEntity(UftTestAction action, Map<String, Entity> foldersMap, List<Entity> parameterEntities, String runnerId, String scmRepositoryId) {
private Entity createUnitEntity(UftTestAction action, Map<String, Entity> foldersMap, List<Entity> parameterEntities, String runnerId, String scmRepositoryId, boolean unitToRunnerEnabled) {
String unitName = SdkStringUtils.isEmpty(action.getLogicalName()) || action.getLogicalName().startsWith("Action") ? action.getTestName() + ":" + action.getName() : action.getLogicalName();
Entity parentFolder = foldersMap.get(action.getTestName());
Entity scmRepository = dtoFactory.newDTO(Entity.class).setType(EntityConstants.ScmRepository.ENTITY_NAME).setId(scmRepositoryId);
Expand All @@ -300,7 +282,7 @@ private Entity createUnitEntity(UftTestAction action, Map<String, Entity> folder
.setField(EntityConstants.MbtUnit.AUTOMATION_STATUS_FIELD, AUTOMATED_AUTOMATION_STATUS)
.setField(EntityConstants.MbtUnit.REPOSITORY_PATH_FIELD, action.getRepositoryPath());

if (bUnitToRunner) {
if (unitToRunnerEnabled) {
unitEntity.setField(EntityConstants.MbtUnit.SCM_REPOSITORY_FIELD, scmRepository)
.setField(EntityConstants.MbtUnit.TEST_RUNNER_FIELD, testRunner);
} else {
Expand Down
Loading