diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2022-05-06 22:36:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-06 22:36:25 +0200 |
| commit | 09c6168f022245380d910cd35495b657ab34fbd1 (patch) | |
| tree | f40c1d040c84b322da42ce2f4285a214e0f27e6e /buildSrc | |
| parent | c3d8d967f82f39f1ef461d5687eb68fb867336c5 (diff) | |
| parent | 0cb3ff64074ba2bfd671c8ca945f54708ea66fe9 (diff) | |
merge: Restructure experiments and remove legacy harness (#82)
This pull request restructures the experiments present in the `opendc-experiments` directory
and removes the legacy OpenDC Harness. Previously, the experiments were written against
the OpenDC Harness, which facilitates generation and execution of scenarios.
However, the OpenDC Harness does not integrate well into the web-based workflow of OpenDC,
where users should be able to submit scenarios in the web interface and automatically simulate
it in the cloud, since the harness relied on a special Kotlin DSL to specify experiments.
In future pull request, we'll attempt to introduce a similar approach for specifying and
running experiments as we have done for the Radice experiments, where the entire
experiment is described in a serializable (JSON/YAML) format.
## Implementation Notes :hammer_and_pick:
* Add helper tools for FaaS simulations
* Fix infinite loop due to invalid rounding
* Convert experiment into integration test
* Add independent Capelin distribution
* Remove OpenDC Harness modules
* Remove unnecessary dependencies
## Breaking API Changes :warning:
* Removal of the OpenDC Harness modules. Instead, we now package each experiment individually.
We'll focus in the future on extracting common code from the Capelin and Radice experiments
so they can be re-used by other experiments as well.
Diffstat (limited to 'buildSrc')
| -rw-r--r-- | buildSrc/build.gradle.kts | 1 | ||||
| -rw-r--r-- | buildSrc/src/main/kotlin/distribution-conventions.gradle.kts | 12 | ||||
| -rw-r--r-- | buildSrc/src/main/kotlin/experiment-conventions.gradle.kts | 59 |
3 files changed, 1 insertions, 71 deletions
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index e975bcbe..42cbf842 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -37,7 +37,6 @@ dependencies { implementation(libs.ktlint.gradle) implementation(libs.jmh.gradle) implementation(libs.dokka.gradle) - implementation(libs.shadow) implementation(libs.jandex.gradle) implementation(libs.quarkus.gradle.application) diff --git a/buildSrc/src/main/kotlin/distribution-conventions.gradle.kts b/buildSrc/src/main/kotlin/distribution-conventions.gradle.kts index 57e5b284..51dbbe63 100644 --- a/buildSrc/src/main/kotlin/distribution-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/distribution-conventions.gradle.kts @@ -45,17 +45,7 @@ distributions { getTasksByName("assembleDist", true) .filter { it.project != project } .map { it.project.name to it.project.the<DistributionContainer>() } - .forEach { (name, dist) -> - dist.findByName("main")?.let { with(it.contents) } - - // Include experiments if they exist - val experiment = dist.findByName("experiment") - if (experiment != null) { - into("experiments/${name.removePrefix("opendc-experiments-")}") { - with(experiment.contents) - } - } - } + .forEach { (name, dist) -> dist.findByName("main")?.let { with(it.contents) } } } } } diff --git a/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts b/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts deleted file mode 100644 index c1750a40..00000000 --- a/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2021 AtLarge Research - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -plugins { - distribution - id("kotlin-conventions") - id("com.github.johnrengelman.shadow") -} - -dependencies { - runtimeOnly(project(":opendc-harness:opendc-harness-junit5")) -} - -tasks.register<Test>("experiment") { - // Ensure JUnit Platform is used for resolving tests - useJUnitPlatform() - - description = "Runs OpenDC experiments" - group = "application" - - testClassesDirs = sourceSets["main"].output.classesDirs - classpath = sourceSets["main"].runtimeClasspath -} - -distributions { - create("experiment") { - contents { - from("README.md") - from(tasks.shadowJar.get()) - } - } -} - -tasks.shadowJar { - dependencies { - // Do not include the JUnit 5 runner in the final shadow jar, since it is only necessary for development - // inside IDE - exclude(project(":opendc-harness:opendc-harness-junit5")) - } -} |
