From a6ceb74271270dbeefaf9d3158c74833c58bf7c3 Mon Sep 17 00:00:00 2001 From: David Kornel Date: Wed, 3 Jul 2024 09:31:03 +0200 Subject: [PATCH] Upgrade to docs gen 0.2.0 + changes doe to api changes (#152) Signed-off-by: David Kornel --- .../io/odh/test/e2e/standard/DataScienceClusterST.md | 8 ++++---- .../{md => }/io/odh/test/e2e/standard/DistributedST.md | 0 .../io/odh/test/e2e/standard/ModelServingST.md | 0 docs/{md => }/io/odh/test/e2e/standard/NotebookST.md | 0 .../io/odh/test/e2e/standard/PipelineServerST.md | 0 .../io/odh/test/e2e/standard/PipelineV2ServerST.md | 0 docs/{md => }/io/odh/test/e2e/standard/UninstallST.md | 0 .../io/odh/test/e2e/upgrade/BundleUpgradeST.md | 8 ++++---- docs/{md => }/io/odh/test/e2e/upgrade/OlmUpgradeST.md | 8 ++++---- pom.xml | 3 ++- .../io/odh/test/e2e/standard/DataScienceClusterST.java | 10 +++++----- .../java/io/odh/test/e2e/upgrade/BundleUpgradeST.java | 10 +++++----- .../java/io/odh/test/e2e/upgrade/OlmUpgradeST.java | 10 +++++----- 13 files changed, 29 insertions(+), 28 deletions(-) rename docs/{md => }/io/odh/test/e2e/standard/DataScienceClusterST.md (92%) rename docs/{md => }/io/odh/test/e2e/standard/DistributedST.md (100%) rename docs/{md => }/io/odh/test/e2e/standard/ModelServingST.md (100%) rename docs/{md => }/io/odh/test/e2e/standard/NotebookST.md (100%) rename docs/{md => }/io/odh/test/e2e/standard/PipelineServerST.md (100%) rename docs/{md => }/io/odh/test/e2e/standard/PipelineV2ServerST.md (100%) rename docs/{md => }/io/odh/test/e2e/standard/UninstallST.md (100%) rename docs/{md => }/io/odh/test/e2e/upgrade/BundleUpgradeST.md (93%) rename docs/{md => }/io/odh/test/e2e/upgrade/OlmUpgradeST.md (93%) diff --git a/docs/md/io/odh/test/e2e/standard/DataScienceClusterST.md b/docs/io/odh/test/e2e/standard/DataScienceClusterST.md similarity index 92% rename from docs/md/io/odh/test/e2e/standard/DataScienceClusterST.md rename to docs/io/odh/test/e2e/standard/DataScienceClusterST.md index 039d3378..ceaabede 100644 --- a/docs/md/io/odh/test/e2e/standard/DataScienceClusterST.md +++ b/docs/io/odh/test/e2e/standard/DataScienceClusterST.md @@ -17,9 +17,9 @@ | - | - | - | | 1. | Delete ODH operator and all created resources | Operator is removed and all other resources as well | -**Tags:** +**Labels:** -* `smoke` +* `smoke` (description file doesn't exist)
@@ -37,7 +37,7 @@ | 2. | Create default DSC | DSC is created and ready | | 3. | Check that DSC has expected states for all components | DSC status is set properly based on configuration | -**Tags:** +**Labels:** -* `smoke` +* `smoke` (description file doesn't exist) diff --git a/docs/md/io/odh/test/e2e/standard/DistributedST.md b/docs/io/odh/test/e2e/standard/DistributedST.md similarity index 100% rename from docs/md/io/odh/test/e2e/standard/DistributedST.md rename to docs/io/odh/test/e2e/standard/DistributedST.md diff --git a/docs/md/io/odh/test/e2e/standard/ModelServingST.md b/docs/io/odh/test/e2e/standard/ModelServingST.md similarity index 100% rename from docs/md/io/odh/test/e2e/standard/ModelServingST.md rename to docs/io/odh/test/e2e/standard/ModelServingST.md diff --git a/docs/md/io/odh/test/e2e/standard/NotebookST.md b/docs/io/odh/test/e2e/standard/NotebookST.md similarity index 100% rename from docs/md/io/odh/test/e2e/standard/NotebookST.md rename to docs/io/odh/test/e2e/standard/NotebookST.md diff --git a/docs/md/io/odh/test/e2e/standard/PipelineServerST.md b/docs/io/odh/test/e2e/standard/PipelineServerST.md similarity index 100% rename from docs/md/io/odh/test/e2e/standard/PipelineServerST.md rename to docs/io/odh/test/e2e/standard/PipelineServerST.md diff --git a/docs/md/io/odh/test/e2e/standard/PipelineV2ServerST.md b/docs/io/odh/test/e2e/standard/PipelineV2ServerST.md similarity index 100% rename from docs/md/io/odh/test/e2e/standard/PipelineV2ServerST.md rename to docs/io/odh/test/e2e/standard/PipelineV2ServerST.md diff --git a/docs/md/io/odh/test/e2e/standard/UninstallST.md b/docs/io/odh/test/e2e/standard/UninstallST.md similarity index 100% rename from docs/md/io/odh/test/e2e/standard/UninstallST.md rename to docs/io/odh/test/e2e/standard/UninstallST.md diff --git a/docs/md/io/odh/test/e2e/upgrade/BundleUpgradeST.md b/docs/io/odh/test/e2e/upgrade/BundleUpgradeST.md similarity index 93% rename from docs/md/io/odh/test/e2e/upgrade/BundleUpgradeST.md rename to docs/io/odh/test/e2e/upgrade/BundleUpgradeST.md index 4dce3f82..71d20182 100644 --- a/docs/md/io/odh/test/e2e/upgrade/BundleUpgradeST.md +++ b/docs/io/odh/test/e2e/upgrade/BundleUpgradeST.md @@ -16,9 +16,9 @@ | - | - | - | | 1. | Delete all ODH related resources in the cluster | All ODH related resources are gone | -**Tags:** +**Labels:** -* `bundle-upgrade` +* `bundle-upgrade` (description file doesn't exist)
@@ -41,7 +41,7 @@ | 7. | Verify that Notebook pods are stable for 2 minutes | Notebook pods are stable por 2 minutes after upgrade | | 8. | Check that ODH operator doesn't contain any error logs | ODH operator log is error free | -**Tags:** +**Labels:** -* `bundle-upgrade` +* `bundle-upgrade` (description file doesn't exist) diff --git a/docs/md/io/odh/test/e2e/upgrade/OlmUpgradeST.md b/docs/io/odh/test/e2e/upgrade/OlmUpgradeST.md similarity index 93% rename from docs/md/io/odh/test/e2e/upgrade/OlmUpgradeST.md rename to docs/io/odh/test/e2e/upgrade/OlmUpgradeST.md index 89027f01..6aef5788 100644 --- a/docs/md/io/odh/test/e2e/upgrade/OlmUpgradeST.md +++ b/docs/io/odh/test/e2e/upgrade/OlmUpgradeST.md @@ -10,9 +10,9 @@ | 2. | Deploy ServiceMesh Operator | ServiceMesh operator is available on the cluster | | 3. | Deploy Serverless Operator | Serverless operator is available on the cluster | -**Tags:** +**Labels:** -* `olm-upgrade` +* `olm-upgrade` (description file doesn't exist)
@@ -35,7 +35,7 @@ | 7. | Verify that Notebook pods are stable for 2 minutes | Notebook pods are stable por 2 minutes after upgrade | | 8. | Check that ODH operator doesn't contain any error logs | ODH operator log is error free | -**Tags:** +**Labels:** -* `olm-upgrade` +* `olm-upgrade` (description file doesn't exist) diff --git a/pom.xml b/pom.xml index bfe3d367..2cf976cf 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 1.7.1 2.16.1 3.0.2 - 0.1.0 + 0.2.0 2.17.1 1.9.21.2 2.27.0 @@ -389,6 +389,7 @@ ./src/test/java/io/odh/test ./docs/ + true false diff --git a/src/test/java/io/odh/test/e2e/standard/DataScienceClusterST.java b/src/test/java/io/odh/test/e2e/standard/DataScienceClusterST.java index 3f45ed3b..5b1fa38c 100644 --- a/src/test/java/io/odh/test/e2e/standard/DataScienceClusterST.java +++ b/src/test/java/io/odh/test/e2e/standard/DataScienceClusterST.java @@ -25,7 +25,7 @@ import io.skodjob.annotations.Step; import io.skodjob.annotations.SuiteDoc; import io.skodjob.annotations.TestDoc; -import io.skodjob.annotations.TestTag; +import io.skodjob.annotations.Label; import io.skodjob.testframe.resources.KubeResourceManager; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -47,8 +47,8 @@ afterTestSteps = { @Step(value = "Delete ODH operator and all created resources", expected = "Operator is removed and all other resources as well") }, - tags = { - @TestTag(value = TestSuite.SMOKE) + labels = { + @Label(value = TestSuite.SMOKE) } ) @Tag(TestSuite.SMOKE) @@ -68,8 +68,8 @@ public class DataScienceClusterST extends StandardAbstract { @Step(value = "Create default DSC", expected = "DSC is created and ready"), @Step(value = "Check that DSC has expected states for all components", expected = "DSC status is set properly based on configuration") }, - tags = { - @TestTag(value = TestSuite.SMOKE) + labels = { + @Label(value = TestSuite.SMOKE) } ) @Test diff --git a/src/test/java/io/odh/test/e2e/upgrade/BundleUpgradeST.java b/src/test/java/io/odh/test/e2e/upgrade/BundleUpgradeST.java index be14d854..c76b0d87 100644 --- a/src/test/java/io/odh/test/e2e/upgrade/BundleUpgradeST.java +++ b/src/test/java/io/odh/test/e2e/upgrade/BundleUpgradeST.java @@ -17,7 +17,7 @@ import io.skodjob.annotations.Step; import io.skodjob.annotations.SuiteDoc; import io.skodjob.annotations.TestDoc; -import io.skodjob.annotations.TestTag; +import io.skodjob.annotations.Label; import io.skodjob.testframe.resources.KubeResourceManager; import io.skodjob.testframe.utils.PodUtils; import org.junit.jupiter.api.AfterAll; @@ -40,8 +40,8 @@ afterTestSteps = { @Step(value = "Delete all ODH related resources in the cluster", expected = "All ODH related resources are gone") }, - tags = { - @TestTag(value = TestSuite.BUNDLE_UPGRADE) + labels = { + @Label(value = TestSuite.BUNDLE_UPGRADE) } ) @Tag(TestSuite.BUNDLE_UPGRADE) @@ -72,8 +72,8 @@ void clean() { @Step(value = "Verify that Notebook pods are stable for 2 minutes", expected = "Notebook pods are stable por 2 minutes after upgrade"), @Step(value = "Check that ODH operator doesn't contain any error logs", expected = "ODH operator log is error free") }, - tags = { - @TestTag(value = TestSuite.BUNDLE_UPGRADE) + labels = { + @Label(value = TestSuite.BUNDLE_UPGRADE) } ) @Test diff --git a/src/test/java/io/odh/test/e2e/upgrade/OlmUpgradeST.java b/src/test/java/io/odh/test/e2e/upgrade/OlmUpgradeST.java index d8b5cf59..d7326c4b 100644 --- a/src/test/java/io/odh/test/e2e/upgrade/OlmUpgradeST.java +++ b/src/test/java/io/odh/test/e2e/upgrade/OlmUpgradeST.java @@ -19,7 +19,7 @@ import io.skodjob.annotations.Step; import io.skodjob.annotations.SuiteDoc; import io.skodjob.annotations.TestDoc; -import io.skodjob.annotations.TestTag; +import io.skodjob.annotations.Label; import io.skodjob.testframe.resources.KubeResourceManager; import io.skodjob.testframe.utils.KubeUtils; import io.skodjob.testframe.utils.PodUtils; @@ -39,8 +39,8 @@ @Step(value = "Deploy ServiceMesh Operator", expected = "ServiceMesh operator is available on the cluster"), @Step(value = "Deploy Serverless Operator", expected = "Serverless operator is available on the cluster") }, - tags = { - @TestTag(value = TestSuite.OLM_UPGRADE) + labels = { + @Label(value = TestSuite.OLM_UPGRADE) } ) @Tag(TestSuite.OLM_UPGRADE) @@ -64,8 +64,8 @@ public class OlmUpgradeST extends UpgradeAbstract { @Step(value = "Verify that Notebook pods are stable for 2 minutes", expected = "Notebook pods are stable por 2 minutes after upgrade"), @Step(value = "Check that ODH operator doesn't contain any error logs", expected = "ODH operator log is error free") }, - tags = { - @TestTag(value = TestSuite.OLM_UPGRADE) + labels = { + @Label(value = TestSuite.OLM_UPGRADE) } ) @Test