Reactivates test database creation via Maven plugin for local test ru…

…ns. Adds skip Parameter for the integrated test DB for Github Actions pipeline.
structr · Aug 29, 2022 · b4c9fab · b4c9fab
1 parent ead4980
commit b4c9fab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -50,9 +50,9 @@ jobs:
       - name: Compile and run Tests
         run:  >-
           echo $ASSIGNED_PORT_${{ matrix.variableName }}_${{ github.run_id }}
-          mvn clean install -DskipTests -DskipDist -DskipDocker -DskipDeb && 
+          mvn clean install -DskipTests -DskipDist -DskipDocker -DskipDeb -DskipDockerTestDB && 
           cd ${{ matrix.module }} && 
-          mvn clean install -Denv.testDatabaseConnection="bolt://localhost:${ASSIGNED_PORT_${{ matrix.variableName }}_${{ github.run_id }}}"
+          mvn clean install -DskipDockerTestDB -Denv.testDatabaseConnection="bolt://localhost:${ASSIGNED_PORT_${{ matrix.variableName }}_${{ github.run_id }}}"
 
       - name: Stop Test Database
         if: always()
@@ -81,7 +81,7 @@ jobs:
           components: 'js,python'
           github-token: ${{ secrets.GITHUB_TOKEN }}    
 
-      - run: mvn -U clean install -Pwith-sources -DskipTests
+      - run: mvn -U clean install -Pwith-sources -DskipTests -DskipDockerTestDB
       - name: Upload binaries
         run: >-
           scp -v structr-binaries/target/structr-*.deb structr.com:/files/repositories/upload > /dev/null 2>&1 &&

diff --git a/structr-test-configuration/pom.xml b/structr-test-configuration/pom.xml
@@ -95,7 +95,7 @@
 							</execution>
 						</executions>
 					</plugin>
-					<!--plugin>
+					<plugin>
 						<groupId>io.fabric8</groupId>
 						<artifactId>docker-maven-plugin</artifactId>
 						<version>0.36.0</version>
@@ -127,7 +127,7 @@
 											</run>
 										</image>
 									</images>
-									<skip>${skipTests}</skip>
+									<skip>${skipDockerTestDB}</skip>
 								</configuration>
 							</execution>
 							<execution>
@@ -137,11 +137,11 @@
 									<goal>stop</goal>
 								</goals>
 								<configuration>
-									<skip>${skipTests}</skip>
+									<skip>${skipDockerTestDB}</skip>
 								</configuration>
 							</execution>
 						</executions>
-					</plugin-->
+					</plugin>
 				</plugins>
 			</build>
 		</profile>