Commit 35f4a167 authored by Anuj Gupta's avatar Anuj Gupta
Browse files

Merge branch 'ibm-cicd-test' into 'master'

enable Ibm cicd for ibm implementation

See merge request !13
parents b38f1f2b 1e5a7426
Pipeline #14440 passed with stages
in 13 minutes and 26 seconds
......@@ -4,6 +4,9 @@ variables:
AWS_SERVICE: crs-catalog
AWS_ENVIRONMENT: dev
AWS_INT_TEST_TYPE: python
IBM_BUILD_SUBDIR: provider/crs-catalog-ibm/crs-catalog-ocp
IBM_INT_TEST_PY_SUBDIR: testing/catalog_test_ibm
IBM_INT_TEST_PY_FILE: run_test.py
include:
- project: 'osdu/platform/ci-cd-pipelines'
......@@ -24,3 +27,6 @@ include:
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/aws.yml"
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/ibm.yml"
......@@ -123,9 +123,22 @@
<!-- for hot reload of the web application-->
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<classifier>spring-boot</classifier>
<mainClass>
org.opengroup.osdu.crs.CrsOcpApplication
</mainClass>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
......
......@@ -10,7 +10,11 @@ def main(argv):
if __name__ == '__main__':
main(sys.argv)
VENDOR = os.getenv("VENDOR")
BASE_URL = os.getenv("BASE_URL", '/api/crs/catalog/v2')
ROOT_URL = os.getenv("VIRTUAL_SERVICE_HOST_NAME")
if VENDOR == 'ibm':
ROOT_URL = os.getenv("IBM_VIRTUAL_HOST_CRS_CATALOG")
else:
ROOT_URL = os.getenv("VIRTUAL_SERVICE_HOST_NAME")
MY_TENANT = os.getenv("MY_TENANT")
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment