Merge branch 'GONRG-7029-anthos-to-baremetal' into 'master'

GONRG-7029: update anthos to baremetal See merge request !537

Merge branch 'GONRG-7029-anthos-to-baremetal' into 'master'
5977033f · Yauheni Rykhter (EPAM) · e726d00e · 6fd35244 · 5977033f · 5977033f
Commit 5977033f authored 1 year ago by Yauheni Rykhter (EPAM)
--- a/devops/gc/pipeline/override-stages.yml
+++ b/devops/gc/pipeline/override-stages.yml
@@ -2,6 +2,6 @@ variables:
  GC_SERVICE: indexer
  GC_VENDOR: gc

-gc-anthos-test:
+gc-baremetal-test:
  variables:
-    GC_VENDOR: anthos
+    GC_VENDOR: baremetal
--- a/provider/indexer-gc/README.md
+++ b/provider/indexer-gc/README.md
@@ -21,9 +21,9 @@ These instructions will get you a copy of the project up and running on your loc

 ## Service Configuration

-### Anthos
+### Baremetal

-[Anthos service configuration](docs/anthos/README.md)
+[Baremetal service configuration](docs/baremetal/README.md)

 ### Google Cloud

@@ -57,9 +57,9 @@ In the current version, the mappers are equipped with several drivers to the sto

 * GCloud SDK with java (latest version)

-### Anthos Service Configuration
+### Baremetal Service Configuration

-[Anthos service configuration](docs/anthos/README.md)
+[Baremetal service configuration](docs/baremetal/README.md)

 ### Google Cloud Service Configuration

@@ -161,9 +161,9 @@ $ (cd testing/indexer-test-core/ && mvn clean install)

 This section describes how to run cloud OSDU E2E tests.

-### Anthos test configuration
+### Baremetal test configuration

-[Anthos service configuration](docs/anthos/README.md)
+[Baremetal service configuration](docs/baremetal/README.md)

 ### Google Cloud test configuration


--- a/provider/indexer-gc/docs/anthos/README.md
+++ b/provider/indexer-gc/docs/anthos/README.md
@@ -32,7 +32,7 @@ Defined in default application property file but possible to override:
 | `STORAGE_HOST`                     | ex `https://storage.com`                                                  | Storage host                                                              | no         | output of infrastructure deployment |
 | `SCHEMA_BASE_HOST`                 | ex `https://schema.com`                                                   | Schema service host                                                       | no         | output of infrastructure deployment |

-These variables define service behavior, and are used to switch between `anthos` or `gcp` environments, their overriding and usage in mixed mode was not tested.
+These variables define service behavior, and are used to switch between `baremetal` or `gcp` environments, their overriding and usage in mixed mode was not tested.
 Usage of spring profiles is preferred.

 | name                     | value                  | description                                                                                                               | sensitive? | source |
@@ -263,5 +263,5 @@ Execute following command to build code and run all the integration tests:
 ```bash
 # Note: this assumes that the environment variables for integration tests as outlined
 #       above are already exported in your environment.
-$ (cd testing/indexer-test-anthos/ && mvn clean test)
+$ (cd testing/indexer-test-baremetal/ && mvn clean test)
 ```
--- a/testing/indexer-test-anthos/pom.xml
+++ b/testing/indexer-test-anthos/pom.xml
@@ -24,7 +24,7 @@
    </parent>
    <modelVersion>4.0.0</modelVersion>

-    <artifactId>indexer-test-anthos</artifactId>
+    <artifactId>indexer-test-baremetal</artifactId>

    <properties>
        <maven.compiler.target>1.8</maven.compiler.target>

--- a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/info/RunTest.java
+++ b/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/info/RunTest.java
--- a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/info/Steps.java
+++ b/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/info/Steps.java
--- a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/record/RunTest.java
+++ b/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/record/RunTest.java
--- a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/record/Steps.java
+++ b/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/record/Steps.java
--- a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/AnthosHTTPClient.java
+++ b/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/AnthosHTTPClient.java
--- a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/OpenIDTokenProvider.java
+++ b/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/OpenIDTokenProvider.java
--- a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/conf/AnthosConfig.java
+++ b/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/conf/AnthosConfig.java
--- a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/conf/OpenIDProviderConfig.java
+++ b/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/conf/OpenIDProviderConfig.java
--- a/testing/indexer-test-anthos/src/test/java/resources/logback-test.xml
+++ b/testing/indexer-test-anthos/src/test/java/resources/logback-test.xml
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -39,7 +39,7 @@
 		<module>indexer-test-aws</module>
 		<module>indexer-test-azure</module>
 		<module>indexer-test-ibm</module>
-        <module>indexer-test-anthos</module>
+        <module>indexer-test-baremetal</module>
    </modules>

 	<repositories>