diff options
Diffstat (limited to 'opendc-web/opendc-web-runner')
| -rw-r--r-- | opendc-web/opendc-web-runner/Dockerfile | 7 | ||||
| -rw-r--r-- | opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/opendc-web/opendc-web-runner/Dockerfile b/opendc-web/opendc-web-runner/Dockerfile index 22c36c65..b3bd0af6 100644 --- a/opendc-web/opendc-web-runner/Dockerfile +++ b/opendc-web/opendc-web-runner/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:19-slim +FROM openjdk:21-slim MAINTAINER OpenDC Maintainers <opendc@atlarge-research.com> # Obtain (cache) Gradle wrapper @@ -11,9 +11,10 @@ RUN ./gradlew --version COPY ./ /app/ RUN ./gradlew --no-daemon :opendc-web:opendc-web-runner:installDist -FROM openjdk:19-slim +FROM openjdk:21-slim COPY --from=0 /app/opendc-web/opendc-web-runner/build/install /opt/ -COPY --from=0 /app/traces /opt/opendc/traces +COPY --from=0 /app/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces \ + /opt/opendc/traces WORKDIR /opt/opendc CMD bin/opendc-web-runner diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt index 7c5c6290..9a1b398e 100644 --- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt +++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt @@ -279,10 +279,10 @@ public class OpenDCRunner( provisioner.runSteps( setupComputeService( serviceDomain, - { createComputeScheduler(scenario.schedulerName, Random(it.seeder.nextLong())) }, + { createComputeScheduler(scenario.schedulerName, Random(it.seeder.nextLong()), timeSource) }, ), registerComputeMonitor(serviceDomain, monitor), - setupHosts(serviceDomain, topology, startTime), + setupHosts(serviceDomain, topology, listOf(), startTime), ) val service = provisioner.registry.resolve(serviceDomain, ComputeService::class.java)!! |