You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2021/05/14 19:56:31 UTC
[sling-org-apache-sling-app-cms] branch master updated: Updating to
only execute IT tests with the CI profile
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/master by this push:
new b16ff55 Updating to only execute IT tests with the CI profile
b16ff55 is described below
commit b16ff5556cc95e22b085c8bb97139add39e29bf2
Author: Dan Klco <kl...@adobe.com>
AuthorDate: Fri May 14 15:54:58 2021 -0400
Updating to only execute IT tests with the CI profile
---
it/pom.xml | 253 ++++++++++++++-------------
transformer/src/test/resources/thumbnail.png | Bin 20437 -> 21183 bytes
2 files changed, 130 insertions(+), 123 deletions(-)
diff --git a/it/pom.xml b/it/pom.xml
index 3e9f9f3..cf21c9b 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -55,130 +55,7 @@
</filesets>
</configuration>
</plugin>
- <!-- reserve a network port for the integration tests -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>reserve-network-port</id>
- <goals>
- <goal>reserve-network-port</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <portNames>
- <portName>http.port</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>feature-launcher-maven-plugin</artifactId>
- <version>0.1.0</version>
- <configuration>
- <launches>
- <launch>
- <id>sling-cms</id>
- <feature>
- <groupId>${project.groupId}</groupId>
- <artifactId>org.apache.sling.cms.feature</artifactId>
- <version>${project.version}</version>
- <classifier>slingcms-standalone</classifier>
- <type>slingosgifeature</type>
- </feature>
- <launcherArguments>
- <frameworkProperties>
- <org.osgi.service.http.port>${http.port}</org.osgi.service.http.port>
- </frameworkProperties>
- </launcherArguments>
- <startTimeoutSeconds>180</startTimeoutSeconds>
- </launch>
- </launches>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>start</goal>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <systemPropertyVariables>
- <sling.http.port>${http.port}</sling.http.port>
- <IT.expected.bundles.count>${IT.expected.bundles.count}</IT.expected.bundles.count>
- </systemPropertyVariables>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>1.7.6</version>
- <executions>
- <execution>
- <id>install node and npm</id>
- <goals>
- <goal>install-node-and-npm</goal>
- </goals>
- <configuration>
- <nodeVersion>v14.2.0</nodeVersion>
- <npmVersion>6.14.5</npmVersion>
- </configuration>
- </execution>
- <execution>
- <id>npm install</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>install</arguments>
- </configuration>
- </execution>
- <execution>
- <id>wait for sling</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <phase>integration-test</phase>
- <configuration>
- <arguments>run wait-for-ready</arguments>
- <environmentVariables>
- <CYPRESS_BASE_URL>http://localhost:${http.port}</CYPRESS_BASE_URL>
- </environmentVariables>
- </configuration>
- </execution>
- <execution>
- <id>run cypress</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <phase>integration-test</phase>
- <configuration>
- <arguments>run test</arguments>
- <environmentVariables>
- <CYPRESS_BASE_URL>http://localhost:${http.port}</CYPRESS_BASE_URL>
- </environmentVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
-
<pluginManagement>
<plugins>
<plugin>
@@ -196,5 +73,135 @@
</plugins>
</pluginManagement>
</build>
+ <profiles>
+ <profile>
+ <id>ci</id>
+ <build>
+ <plugins>
+ <!-- reserve a network port for the integration tests -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <portNames>
+ <portName>http.port</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>feature-launcher-maven-plugin</artifactId>
+ <version>0.1.0</version>
+ <configuration>
+ <launches>
+ <launch>
+ <id>sling-cms</id>
+ <feature>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>org.apache.sling.cms.feature</artifactId>
+ <version>${project.version}</version>
+ <classifier>slingcms-standalone</classifier>
+ <type>slingosgifeature</type>
+ </feature>
+ <launcherArguments>
+ <frameworkProperties>
+ <org.osgi.service.http.port>${http.port}</org.osgi.service.http.port>
+ </frameworkProperties>
+ </launcherArguments>
+ <startTimeoutSeconds>180</startTimeoutSeconds>
+ </launch>
+ </launches>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>start</goal>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <systemPropertyVariables>
+ <sling.http.port>${http.port}</sling.http.port>
+ <IT.expected.bundles.count>${IT.expected.bundles.count}</IT.expected.bundles.count>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>1.7.6</version>
+ <executions>
+ <execution>
+ <id>install node and npm</id>
+ <goals>
+ <goal>install-node-and-npm</goal>
+ </goals>
+ <configuration>
+ <nodeVersion>v14.2.0</nodeVersion>
+ <npmVersion>6.14.5</npmVersion>
+ </configuration>
+ </execution>
+ <execution>
+ <id>npm install</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <configuration>
+ <arguments>install</arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>wait for sling</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <phase>integration-test</phase>
+ <configuration>
+ <arguments>run wait-for-ready</arguments>
+ <environmentVariables>
+ <CYPRESS_BASE_URL>http://localhost:${http.port}</CYPRESS_BASE_URL>
+ </environmentVariables>
+ </configuration>
+ </execution>
+ <execution>
+ <id>run cypress</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <phase>integration-test</phase>
+ <configuration>
+ <arguments>run test</arguments>
+ <environmentVariables>
+ <CYPRESS_BASE_URL>http://localhost:${http.port}</CYPRESS_BASE_URL>
+ </environmentVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/transformer/src/test/resources/thumbnail.png b/transformer/src/test/resources/thumbnail.png
index f38c3a4..62cf067 100644
Binary files a/transformer/src/test/resources/thumbnail.png and b/transformer/src/test/resources/thumbnail.png differ