>From Ian Maxon <[email protected]>: Ian Maxon has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18654 )
Change subject: [NO ISSUE][OTH] Place azurite tests in profile ...................................................................... [NO ISSUE][OTH] Place azurite tests in profile - user model changes: no - storage format changes: no - interface changes: no Details: Change-Id: Ic94d5a260c0b3ac3ed7df29d7b473a2a20d32e8d Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18654 Tested-by: Ian Maxon <[email protected]> Reviewed-by: Ian Maxon <[email protected]> Reviewed-by: Michael Blow <[email protected]> Integration-Tests: Jenkins <[email protected]> --- M asterixdb/asterix-app/pom.xml M asterixdb/pom.xml M asterixdb/asterix-cloud/pom.xml 3 files changed, 97 insertions(+), 38 deletions(-) Approvals: Ian Maxon: Looks good to me, but someone else must approve; Verified Michael Blow: Looks good to me, approved Jenkins: Verified diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index ecd91d5..5b2f8a4 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -590,6 +590,43 @@ <failIfNoTests>false</failIfNoTests> </properties> </profile> + <profile> + <id>azurite-tests</id> + <build> + <plugins> + <plugin> + <groupId>com.github.eirslett</groupId> + <artifactId>frontend-maven-plugin</artifactId> + <version>1.13.4</version> + <configuration> + <nodeVersion>v14.15.4</nodeVersion> + <npmVersion>6.14.11</npmVersion> + <workingDirectory>target/npm</workingDirectory> + <installDirectory>target/npm</installDirectory> + </configuration> + <executions> + <execution> + <id>install node and yarn</id> + <goals> + <goal>install-node-and-npm</goal> + </goals> + <phase>${azurite.npm.install.stage}</phase> + </execution> + <execution> + <id>azurite blob</id> + <phase>${azurite.install.stage}</phase> + <goals> + <goal>npm</goal> + </goals> + <configuration> + <arguments>install azurite</arguments> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> <dependencies> <dependency> diff --git a/asterixdb/asterix-cloud/pom.xml b/asterixdb/asterix-cloud/pom.xml index 6839367..9244979 100644 --- a/asterixdb/asterix-cloud/pom.xml +++ b/asterixdb/asterix-cloud/pom.xml @@ -162,39 +162,49 @@ </execution> </executions> </plugin> - <plugin> - <groupId>com.github.eirslett</groupId> - <artifactId>frontend-maven-plugin</artifactId> - <version>1.13.4</version> - <configuration> - <nodeVersion>v14.15.4</nodeVersion> - <npmVersion>6.14.11</npmVersion> - <workingDirectory>target/npm</workingDirectory> - <installDirectory>target/npm</installDirectory> - </configuration> - <executions> - <execution> - <id>install node and yarn</id> - <goals> - <goal>install-node-and-npm</goal> - </goals> - <phase>${azurite.npm.install.stage}</phase> - </execution> - <execution> - <id>azurite blob</id> - <phase>${azurite.install.stage}</phase> - <goals> - <goal>npm</goal> - </goals> - <configuration> - <arguments>install azurite</arguments> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> + <profiles> + <profile> + <id>azurite-tests</id> + <build> + <plugins> + <plugin> + <groupId>com.github.eirslett</groupId> + <artifactId>frontend-maven-plugin</artifactId> + <version>1.13.4</version> + <configuration> + <nodeVersion>v14.15.4</nodeVersion> + <npmVersion>6.14.11</npmVersion> + <workingDirectory>target/npm</workingDirectory> + <installDirectory>target/npm</installDirectory> + </configuration> + <executions> + <execution> + <id>install node and yarn</id> + <goals> + <goal>install-node-and-npm</goal> + </goals> + <phase>${azurite.npm.install.stage}</phase> + </execution> + <execution> + <id>azurite blob</id> + <phase>${azurite.install.stage}</phase> + <goals> + <goal>npm</goal> + </goals> + <configuration> + <arguments>install azurite</arguments> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index f99f23c..94bd6e1 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -752,14 +752,6 @@ </profile> <profile> <id>azurite-tests</id> - <activation> - <os> - <family>unix</family> - </os> - <property> - <name>!skipTests</name> - </property> - </activation> <properties> <azurite.npm.install.stage>process-classes</azurite.npm.install.stage> <azurite.install.stage>generate-test-resources</azurite.install.stage> -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18654 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: Ic94d5a260c0b3ac3ed7df29d7b473a2a20d32e8d Gerrit-Change-Number: 18654 Gerrit-PatchSet: 4 Gerrit-Owner: Ian Maxon <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]> Gerrit-MessageType: merged
