Modular hawkBit (#378)
* Cleaned up component scan * More flexibility for hawkBit micro services * Introduce spring boot starters * Eclipse Jetty as hawkBit default * Fixed links as prep for wiki removal Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
@@ -112,10 +112,6 @@ public class ConfigurableScenario {
|
||||
runRollouts(scenario);
|
||||
}
|
||||
|
||||
if (scenario.isRunRollouts()) {
|
||||
runRollouts(scenario);
|
||||
}
|
||||
|
||||
if (scenario.isRunSemiAutomaticRollouts() && !scenario.getDeviceGroups().isEmpty()) {
|
||||
runSemiAutomaticRollouts(scenario);
|
||||
}
|
||||
@@ -217,7 +213,7 @@ public class ConfigurableScenario {
|
||||
// start the created Rollout
|
||||
rolloutResource.start(rolloutResponseBody.getRolloutId());
|
||||
|
||||
waitUntilRolloutIsComplete(scenario);
|
||||
waitUntilRolloutIsComplete(rolloutResponseBody.getRolloutId());
|
||||
LOGGER.info("Run rollout for set {} -> Done", set.getDsId());
|
||||
}
|
||||
|
||||
@@ -256,20 +252,19 @@ public class ConfigurableScenario {
|
||||
// start the created Rollout
|
||||
rolloutResource.start(rolloutResponseBody.getRolloutId());
|
||||
|
||||
waitUntilRolloutIsComplete(scenario);
|
||||
waitUntilRolloutIsComplete(rolloutResponseBody.getRolloutId());
|
||||
LOGGER.info("Run rollout for set {} -> Done", set.getDsId());
|
||||
}
|
||||
|
||||
private void waitUntilRolloutIsComplete(final Scenario scenario) {
|
||||
private void waitUntilRolloutIsComplete(final Long id) {
|
||||
do {
|
||||
try {
|
||||
TimeUnit.SECONDS.sleep(35);
|
||||
TimeUnit.SECONDS.sleep(5);
|
||||
} catch (final InterruptedException e) {
|
||||
LOGGER.warn("Interrupted!");
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
} while (targetResource.getTargets(0, 1, null, "updateStatus==IN_SYNC").getBody().getTotal() < scenario
|
||||
.getTargets());
|
||||
} while (!"FINISHED".equalsIgnoreCase(rolloutResource.getRollout(id).getBody().getStatus()));
|
||||
}
|
||||
|
||||
private void waitUntilRolloutIsReady(final Long id) {
|
||||
|
||||
Reference in New Issue
Block a user