From 53201873f9c9727e511fcac0bbf8da99585dc3a3 Mon Sep 17 00:00:00 2001 From: Emidowojo <54295353+Emidowojo@users.noreply.github.com> Date: Wed, 12 Oct 2022 20:26:37 +0100 Subject: [PATCH] Updating mermaid live code (#4029) * Updating mermaid live code * Updated README with live mermaid code * updated mermaid code --- README.md | 56 ++++- doc/diagrams/externaltests.svg | 350 -------------------------- doc/diagrams/overviewOfAdoptTests.svg | 350 -------------------------- doc/diagrams/perftests.svg | 350 -------------------------- 4 files changed, 53 insertions(+), 1053 deletions(-) delete mode 100644 doc/diagrams/externaltests.svg delete mode 100644 doc/diagrams/overviewOfAdoptTests.svg delete mode 100644 doc/diagrams/perftests.svg diff --git a/README.md b/README.md index 99871e5221..94cdf3afde 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,26 @@ For nightly and release builds, there are test jobs running as part of the Adopt The directory structure in this aqa-tests repository is meant to reflect the different types of test we run (and pull from lots of other locations). The diagrams below show the test make target for each of the types, along with in-plan, upcoming additions (denoted by dotted line grey boxes). The provided links jump to test jobs in Jenkins (ci.adoptopenjdk.net). -![overview of tests](doc/diagrams/overviewOfAdoptTests.svg) +```mermaid +graph TD + A[openjdk-tests] -->B[make _perf] + A[openjdk-tests] -->C[make _openjdk] + A[openjdk-tests] -->D[make _system] + A[openjdk-tests] -->E[make _functional] + A[openjdk-tests] -->F[make _jck] + A[openjdk-tests] -->G[make _external] + B[make _perf] -->|perf|H[performance] + H[performance] -->|_sanity.perf|I[.....] + H[performance] -->|_extended.perf|J[..] + C[make _openjdk] -->|openjdk|K[openjdk] + D[make _system] -->|system|L[system] + E[make _functional] -->|functional|M[functional] + F[make _jck] -->|jck|N[jck] + G[make _external] -->|external|O[external] + O[external] -->|_sanity.external|P[...] + O[external] -->|_extended.external|Q[....] + +``` --- @@ -39,13 +58,44 @@ Tests from the adoptium/aqa-systemtest repo ##### [external](https://ci.adoptopenjdk.net/view/Test_external/) tests - 3rd party application tests Test suites from a variety of applications, along with microprofile TCKs, run in Docker containers -![external tests](doc/diagrams/externaltests.svg) + +```mermaid +graph TD + A[openjdk-tests] -->|make _external| B[external] + B --> C[derby] + B --> D[elasticsearch] + B --> E[example] + B --> F[jenkins] + B --> G[kafka] + B --> H[lucene-solr] + B -->|_sanity.external|I[scala] + B --> J[tomcat] + B --> K[wildfly] + B --> L[openliberty] + B --> M[geode] + B --> N[hbase] + B --> O[akka] + B --> P[logstash] + B --> Q[openliberty-mp-tck] + B -->|_extended.external|R[payara-mp-tck] + B --> S[thorntail-mp-tck] + +``` --- ##### [perf](https://ci.adoptopenjdk.net/view/Test_perf/) tests - Performance benchmark suites Performance benchmark tests (both full suites and microbenches) from different open-source projects such as Acme-Air and adoptium/bumblebench -![perf tests](doc/diagrams/perftests.svg) + +```mermaid +graph TD + A[openjdk-tests] -->|make _perf| B[performance] + B -->|_sanity.perf| C[bbench] + B --> D[idle_micro] + B --> E[odm] + B -->|_extended.perf| F[liberty_dt] + B --> G[acme_air] + ``` --- diff --git a/doc/diagrams/externaltests.svg b/doc/diagrams/externaltests.svg deleted file mode 100644 index 31867cfdf1..0000000000 --- a/doc/diagrams/externaltests.svg +++ /dev/null @@ -1,350 +0,0 @@ -
_sanity.external
_extended.external
make _external
external
derby
elasticsearch
example
jenkins
kafka
lucene-solr
scala
tomcat
wildfly
openliberty
geode
hbase
akka
logstash
openliberty-mp-tck
payara-mp-tck
thorntail-mp-tck
openjdk-tests
\ No newline at end of file diff --git a/doc/diagrams/overviewOfAdoptTests.svg b/doc/diagrams/overviewOfAdoptTests.svg deleted file mode 100644 index ee9445614b..0000000000 --- a/doc/diagrams/overviewOfAdoptTests.svg +++ /dev/null @@ -1,350 +0,0 @@ -
_sanity.perf
_extended.perf
_sanity.external
_extended.external
external
perf
openjdk
system
functional
jck
make _openjdk
make _system
make _perf
make _functional
make _jck
make _external
.....
..
...
....
external
performance
openjdk
system
functional
jck
openjdk-tests
\ No newline at end of file diff --git a/doc/diagrams/perftests.svg b/doc/diagrams/perftests.svg deleted file mode 100644 index 977975459a..0000000000 --- a/doc/diagrams/perftests.svg +++ /dev/null @@ -1,350 +0,0 @@ -
_sanity.perf
_extended.perf
make _perf
performance
bbench
idle_micro
odm
liberty_dt
acme_air
openjdk-tests
\ No newline at end of file