Merge remote-tracking branch 'origin/main' into testing
This commit is contained in:
commit
5ec7f58bbd
2 changed files with 5 additions and 3 deletions
|
|
@ -8,6 +8,9 @@
|
|||
- "/usr/share/edk2/ovmf/OVMF_CODE.fd"
|
||||
- "/usr/share/edk2/x64/OVMF_CODE.fd"
|
||||
- "/usr/share/OVMF/OVMF_CODE.fd"
|
||||
# Use 4M version as fallback (if smaller version not available)
|
||||
- "/usr/share/edk2/ovmf-4m/OVMF_CODE.fd"
|
||||
- "/usr/share/edk2/x64/OVMF_CODE.4m.fd"
|
||||
"vars":
|
||||
- "/usr/share/edk2/ovmf/OVMF_VARS.fd"
|
||||
- "/usr/share/edk2/x64/OVMF_VARS.fd"
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@ public class Runner extends Component {
|
|||
private static final String FW_VARS = "fw-vars.fd";
|
||||
private static int exitStatus;
|
||||
|
||||
private EventPipeline rep;
|
||||
private final EventPipeline rep = newEventPipeline();
|
||||
private final ObjectMapper yamlMapper = new ObjectMapper(YAMLFactory
|
||||
.builder().disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER)
|
||||
.build());
|
||||
|
|
@ -446,8 +446,7 @@ public class Runner extends Component {
|
|||
// https://github.com/kubernetes-client/java/issues/100
|
||||
io.kubernetes.client.openapi.Configuration.setDefaultApiClient(null);
|
||||
|
||||
// Prepare specific event pipeline to avoid concurrency.
|
||||
rep = newEventPipeline();
|
||||
// Provide specific event pipeline to avoid concurrency.
|
||||
event.setAssociated(EventPipeline.class, rep);
|
||||
try {
|
||||
// Store process id
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue