Skip to content

Commit adbb1ce

Browse files
jaebchoijaebchoi
authored
Merge pull request #438 from boozallen/4-cyclic-helm-test
#4. Fix Cyclic test in test mda models
2 parents 0972a54 + 5a80c62 commit adbb1ce

File tree

8 files changed

+34
-88
lines changed

8 files changed

+34
-88
lines changed

‎build-parent/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,9 @@
161161

162162
<!-- OpenLineage java -->
163163
<version.open.lineage.java>1.23.0</version.open.lineage.java>
164+
165+
<!-- Used for pinning version specifically test-mda-model-->
166+
<version.test.resteasy>3.15.6.Final</version.test.resteasy>
164167
</properties>
165168

166169
<dependencyManagement>

‎test/test-mda-models/aissemble-test-data-delivery-pyspark-model-basic/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,10 @@
8787
</execution>
8888
</executions>
8989
</plugin>
90-
<!--NB: inactive by default until https://github.com/boozallen/aissemble/issues/4 is resolved: -->
9190
<plugin>
9291
<groupId>org.codehaus.mojo</groupId>
9392
<artifactId>exec-maven-plugin</artifactId>
94-
<version>3.1.0</version>
93+
<version>${version.exec.maven.plugin}</version>
9594
<executions>
9695
<execution>
9796
<id>test-chart</id>
@@ -104,10 +103,7 @@
104103
<arguments>
105104
<argument>template</argument>
106105
<argument>aissemble-spark-application-chart</argument>
107-
<argument>--repo</argument>
108-
<argument>${aissemble.helm.repo}</argument>
109-
<argument>--version</argument>
110-
<argument>${version.aissemble}</argument>
106+
<argument>${project.basedir}/../../../extensions/extensions-helm/aissemble-spark-application-chart</argument>
111107
<argument>--values</argument>
112108
<argument>
113109
src/aissemble_test_data_delivery_pyspark_model_basic/resources/apps/pyspark-data-delivery-basic-base-values.yaml,tests/resources/apps/pyspark-data-delivery-basic-test-values.yaml

‎test/test-mda-models/aissemble-test-data-delivery-pyspark-model/pom.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
</execution>
9393
</executions>
9494
</plugin>
95-
<!--NB: inactive by default until https://github.com/boozallen/aissemble/issues/4 is resolved: -->
9695
<plugin>
9796
<groupId>org.codehaus.mojo</groupId>
9897
<artifactId>exec-maven-plugin</artifactId>
@@ -109,10 +108,7 @@
109108
<arguments>
110109
<argument>template</argument>
111110
<argument>aissemble-spark-application-chart</argument>
112-
<argument>--repo</argument>
113-
<argument>${aissemble.helm.repo}</argument>
114-
<argument>--version</argument>
115-
<argument>${version.aissemble}</argument>
111+
<argument>${project.basedir}/../../../extensions/extensions-helm/aissemble-spark-application-chart</argument>
116112
<argument>--values</argument>
117113
<argument>
118114
src/aissemble_test_data_delivery_pyspark_model/resources/apps/pyspark-data-delivery-patterns-base-values.yaml,tests/resources/apps/pyspark-data-delivery-patterns-test-values.yaml

‎test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/features/steps/filestore_steps.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import os
1111
import nose.tools as nt
1212
from behave import given, when, then # pylint: disable=no-name-in-module
13-
from aiops_core_filestore.file_store_factory import FileStoreFactory
13+
from aissemble_core_filestore.file_store_factory import FileStoreFactory
1414
from libcloud.utils.py3 import httplib
1515
from krausening.logging import LogManager
1616

‎test/test-mda-models/pom.xml‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -78,38 +78,4 @@
7878
</plugins>
7979
</pluginManagement>
8080
</build>
81-
82-
<profiles>
83-
<profile>
84-
<!-- NB: Temp workaround until https://github.com/boozallen/aissemble/issues/4 is resolved: -->
85-
<activation>
86-
<activeByDefault>true</activeByDefault>
87-
</activation>
88-
89-
<!-- Skip helm test-chart generation during a release, since the necessary helm charts won't be published -->
90-
<id>skip-helm</id>
91-
<properties>
92-
<!-- skip tests since they rely on the generated test SparkApplication yaml that we are disabling -->
93-
<skipTests>true</skipTests>
94-
</properties>
95-
<build>
96-
<plugins>
97-
<plugin>
98-
<groupId>org.codehaus.mojo</groupId>
99-
<artifactId>exec-maven-plugin</artifactId>
100-
<version>${version.exec.maven.plugin}</version>
101-
<executions>
102-
<execution>
103-
<id>test-chart</id>
104-
<configuration>
105-
<skip>true</skip>
106-
</configuration>
107-
</execution>
108-
</executions>
109-
</plugin>
110-
</plugins>
111-
</build>
112-
</profile>
113-
</profiles>
114-
11581
</project>

‎test/test-mda-models/test-data-delivery-spark-model-basic/pom.xml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<groupId>org.codehaus.mojo</groupId>
6565
<artifactId>build-helper-maven-plugin</artifactId>
6666
</plugin>
67-
<!--NB: inactive by default until https://github.com/boozallen/aissemble/issues/4 is resolved: -->
67+
<!--TODO: 3 steps are disabled and shall be available once https://github.com/boozallen/aissemble/issues/430 is resolved: : -->
6868
<plugin>
6969
<groupId>org.codehaus.mojo</groupId>
7070
<artifactId>exec-maven-plugin</artifactId>
@@ -81,10 +81,7 @@
8181
<arguments>
8282
<argument>template</argument>
8383
<argument>aissemble-spark-application-chart</argument>
84-
<argument>--repo</argument>
85-
<argument>${aissemble.helm.repo}</argument>
86-
<argument>--version</argument>
87-
<argument>${version.aissemble}</argument>
84+
<argument>${project.basedir}/../../../extensions/extensions-helm/aissemble-spark-application-chart</argument>
8885
<argument>--values</argument>
8986
<argument>
9087
src/main/resources/apps/spark-java-data-delivery-basic-base-values.yaml,src/test/resources/apps/spark-java-data-delivery-basic-test-values.yaml
@@ -239,5 +236,17 @@
239236
<version>${version.cucumber.reporting.plugin}</version>
240237
<scope>test</scope>
241238
</dependency>
239+
<dependency>
240+
<groupId>org.jboss.resteasy</groupId>
241+
<artifactId>resteasy-client</artifactId>
242+
<version>${version.test.resteasy}</version>
243+
<scope>test</scope>
244+
</dependency>
245+
<dependency>
246+
<groupId>org.apache.hadoop</groupId>
247+
<artifactId>hadoop-aws</artifactId>
248+
<version>${version.hadoop}</version>
249+
<scope>provided</scope>
250+
</dependency>
242251
</dependencies>
243252
</project>

‎test/test-mda-models/test-data-delivery-spark-model/pom.xml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
<groupId>org.codehaus.mojo</groupId>
7474
<artifactId>build-helper-maven-plugin</artifactId>
7575
</plugin>
76-
<!--NB: inactive by default until https://github.com/boozallen/aissemble/issues/4 is resolved: -->
7776
<plugin>
7877
<groupId>org.codehaus.mojo</groupId>
7978
<artifactId>exec-maven-plugin</artifactId>
@@ -90,10 +89,7 @@
9089
<arguments>
9190
<argument>template</argument>
9291
<argument>aissemble-spark-application-chart</argument>
93-
<argument>--repo</argument>
94-
<argument>${aissemble.helm.repo}</argument>
95-
<argument>--version</argument>
96-
<argument>${version.aissemble}</argument>
92+
<argument>${project.basedir}/../../../extensions/extensions-helm/aissemble-spark-application-chart</argument>
9793
<argument>--values</argument>
9894
<argument>
9995
src/main/resources/apps/spark-java-data-delivery-patterns-base-values.yaml,src/test/resources/apps/spark-java-data-delivery-patterns-test-values.yaml
@@ -248,5 +244,17 @@
248244
<version>${version.cucumber.reporting.plugin}</version>
249245
<scope>test</scope>
250246
</dependency>
247+
<dependency>
248+
<groupId>org.jboss.resteasy</groupId>
249+
<artifactId>resteasy-client</artifactId>
250+
<version>${version.test.resteasy}</version>
251+
<scope>test</scope>
252+
</dependency>
253+
<dependency>
254+
<groupId>org.apache.hadoop</groupId>
255+
<artifactId>hadoop-aws</artifactId>
256+
<version>${version.hadoop}</version>
257+
<scope>provided</scope>
258+
</dependency>
251259
</dependencies>
252260
</project>

‎test/test-mda-models/test-data-delivery-spark-model/src/main/resources/pipelines/SparkJavaDataDeliveryPatterns.json‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,6 @@
6868
"channelName": "outboundChannel"
6969
}
7070
},
71-
{
72-
"name": "VoidInboundAndMessagingOutboundAsync",
73-
"type": "asynchronous",
74-
"outbound": {
75-
"type": "messaging",
76-
"channelName": "outboundChannel"
77-
}
78-
},
7971
{
8072
"name": "MessagingInboundAndVoidOutbound",
8173
"type": "synchronous",
@@ -402,18 +394,6 @@
402394
}
403395
}
404396
},
405-
{
406-
"name": "MessagingOutboundWithCustomTypesAsync",
407-
"type": "asynchronous",
408-
"outbound": {
409-
"type": "messaging",
410-
"channelName": "outboundChannel",
411-
"recordType": {
412-
"name": "CustomRecord",
413-
"package": "com.boozallen.aiops.mda.pattern.record"
414-
}
415-
}
416-
},
417397
{
418398
"name": "MessagingOutboundWithCustomRec",
419399
"type": "synchronous",
@@ -426,18 +406,6 @@
426406
}
427407
}
428408
},
429-
{
430-
"name": "MessagingOutboundWithCustomRecAsync",
431-
"type": "asynchronous",
432-
"outbound": {
433-
"type": "messaging",
434-
"channelName": "outboundChannel",
435-
"recordType": {
436-
"name": "CustomRec",
437-
"package": "com.boozallen.aiops.mda.pattern.record"
438-
}
439-
}
440-
},
441409
{
442410
"name": "MessagingInboundWithCustomRec",
443411
"type": "synchronous",

0 commit comments

Comments
 (0)