Commit df0f4917 authored by Abhishek Kumar (SLB)'s avatar Abhishek Kumar (SLB)
Browse files

Merge remote-tracking branch 'origin/master' into

slb-nested-ref-validation

Conflicts:
	schema-core/pom.xml
parents cfa0a068 fd165fde
Pipeline #117430 failed with stages
in 1 minute and 13 seconds
variables:
BUILD_BOOTSTRAP_PATH: "devops/$OSDU_GCP_VENDOR/bootstrap-osdu-module/Dockerfile"
OSDU_GCP_ENABLE_BOOTSTRAP: "true"
OSDU_GCP_SERVICE: schema
OSDU_GCP_VENDOR: gcp
OSDU_GCP_HELM_TIMEOUT: "--timeout 15m"
OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: >
--set data.log_level=INFO
--set data.google_audiences=$GOOGLE_AUDIENCE
--set data.shared_tenant_name=$OSDU_GCP_TENANT
--set data.data_partition_id=$DATA_PARTITION_ID
osdu-gcp-dev2-deploy-deployment:
needs:
- osdu-gcp-containerize-gitlab
- osdu-gcp-dev2-deploy-configmap
- osdu-gcp-containerize-bootstrap-gitlab
osdu-gcp-test:
script:
- $MAVEN_BUILD . test-results.log verify -q -f testing/schema-test-core/pom.xml
artifacts:
when: always
paths:
- test-results.log
- testing/schema-test-core/target/*/TEST-*.xml
reports:
junit:
- testing/schema-test-core/target/*/TEST-*.xml
# FIXME for DEV2
osdu-gcp-dev2-test:
script:
- $MAVEN_BUILD . test-results.log verify -q -f testing/schema-test-core/pom.xml
artifacts:
when: always
paths:
- test-results.log
- testing/schema-test-core/target/*/TEST-*.xml
reports:
junit:
- testing/schema-test-core/target/*/TEST-*.xml
osdu-gcp-anthos-test:
script:
- $MAVEN_BUILD . test-results.log verify -q -f testing/schema-test-core/pom.xml
artifacts:
when: always
paths:
- test-results.log
- testing/schema-test-core/target/*/TEST-*.xml
reports:
junit:
- testing/schema-test-core/target/*/TEST-*.xml
variables:
BUILD_BOOTSTRAP_PATH: "devops/$OSDU_GCP_VENDOR/bootstrap-osdu-module/Dockerfile"
OSDU_GCP_ENABLE_BOOTSTRAP: "true"
OSDU_GCP_SERVICE: schema
OSDU_GCP_VENDOR: gcp
OSDU_GCP_HELM_TIMEOUT: "--timeout 15m"
osdu-gcp-test:
variables:
OSDU_GCP_TEST_SUBDIR: testing/schema-test-core
script:
- $MAVEN_BUILD . test-results.log verify -q -f $OSDU_GCP_TEST_SUBDIR/pom.xml
osdu-gcp-dev2-test:
variables:
OSDU_GCP_TEST_SUBDIR: testing/schema-test-core
script:
- $MAVEN_BUILD . test-results.log verify -q -f $OSDU_GCP_TEST_SUBDIR/pom.xml
osdu-gcp-anthos-test:
variables:
OSDU_GCP_TEST_SUBDIR: testing/schema-test-core
script:
- $MAVEN_BUILD . test-results.log verify -q -f $OSDU_GCP_TEST_SUBDIR/pom.xml
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opengroup.osdu</groupId>
......@@ -102,7 +100,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.13.3</version>
</dependency>
<dependency>
......@@ -163,12 +160,16 @@
<artifactId>jackson-databind</artifactId>
<version>2.13.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.13.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.13.3</version>
</dependency>
</dependencies>
<build>
......@@ -214,7 +215,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version>
<version>3.0.0-M7</version>
<configuration>
<includes>
<include>*Test.java</include>
......@@ -224,6 +225,13 @@
<reuseForks>true</reuseForks>
<argLine>@{argLine} -Xmx1024m -XX:MaxPermSize=256m</argLine>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
<version>3.0.0-M7</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
......
......@@ -273,7 +273,6 @@ public class SchemaServiceTest {
public void testCreateSchema_SharedSchema()
throws JsonProcessingException, ApplicationException, BadRequestException, NotFoundException {
String dataPartitionId = "common";
String schemaId = "os:wks:well:1.1.1";
SchemaRequest schReqInt = getMockSchemaObject_published_InternalScope();
SchemaRequest schReqPub = getMockSchemaObject_published();
......@@ -297,7 +296,7 @@ public class SchemaServiceTest {
Mockito.when(schemaInfoStore.createSchemaInfo(schReqPub)).thenReturn(schInfoPub);
Mockito.when(schemaStore.getSchema(anyString(), anyString())).thenReturn(schReqPub.getSchema().toString());
Mockito.when(schemaUtil.findSchemaToCompare(schReqPub.getSchemaInfo(), true)).thenReturn(schemaInfoArr);
Mockito.when(schemaUtil.findSchemaToCompare(schReqPub.getSchemaInfo(), false)).thenReturn(schemaInfoArr);
Mockito.when(schemaVersionValidatorFactory.getVersionValidator(Matchers.any(SchemaValidationType.class)))
.thenReturn(mock(VersionValidator.class));
assertEquals(SchemaStatus.PUBLISHED, schemaService.createSchema(schReqPub).getStatus());
......
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