Skip to content
This repository has been archived by the owner on Jun 6, 2024. It is now read-only.

Fix additional fields regression in HiveD config #4878

Merged
merged 1 commit into from
Sep 8, 2020
Merged
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion src/webportal/src/app/job-submission/models/job-protocol.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,17 @@ export class JobProtocol {
jobTaskRoles,
);
if (config.launcherScheduler === 'hivedscheduler') {
protocolExtras.hivedScheduler = { taskRoles: hivedTaskRoles };
const newTaskRoles = get(protocolExtras, 'hivedScheduler.taskRoles', {});
for (const name in hivedTaskRoles) {
newTaskRoles[name] = {
...newTaskRoles[name],
...hivedTaskRoles[name],
};
}
protocolExtras.hivedScheduler = {
...protocolExtras.hivedScheduler,
taskRoles: newTaskRoles,
};
}
const secrets = removeEmptyProperties(
jobSecrets.reduce((res, secret) => {
Expand Down