Skip to content

Commit 7f31c8a

Browse files
authored
Fix IT execution on Windows (#28)
This closes #27
1 parent 6907a62 commit 7f31c8a

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
build:
3030
strategy:
3131
matrix:
32-
os: [ubuntu-latest, macOS-latest] # Windows doe not yet work
32+
os: [ubuntu-latest, macos-latest, windows-latest] # Windows doe not yet work
3333
jdk: [8, 11, 17]
3434
include:
3535
# lengthy build steps should only be performed on linux with Java 11 (SonarQube analysis, deployment)
@@ -69,7 +69,7 @@ jobs:
6969
run: |
7070
if [ "${{ matrix.isMainBuildEnv }}" = "true" ]; then
7171
echo "MVN_ADDITIONAL_OPTS=-Dsonar.projectKey=Netcentric_aem-cloud-validator -Dsonar.organization=netcentric -Dsonar.host.url=https://sonarcloud.io -Pjacoco-report" >> $GITHUB_ENV
72-
if [ "${{github.ref}}" = "refs/heads/master" ] && [ "${{github.event_name}}" = "push" ]; then
72+
if [ "${{github.ref}}" = "refs/heads/main" ] && [ "${{github.event_name}}" = "push" ]; then
7373
echo "MAVEN_USERNAME=${{ secrets.OSSRH_TOKEN_USER }}" >> $GITHUB_ENV
7474
echo "MAVEN_PASSWORD=${{ secrets.OSSRH_TOKEN_PASSWORD }}" >> $GITHUB_ENV
7575
echo "MVN_GOAL=clean deploy org.sonarsource.scanner.maven:sonar-maven-plugin:sonar" >> $GITHUB_ENV

src/it/project1/verify.groovy

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
String buildLog = new File(basedir, 'build.log').text
22

3-
assert buildLog.contains('[WARNING] ValidationViolation: "netcentric-aem-cloud: Nodes below \'/libs\' may be overwritten by future product upgrades. Rather use \'/apps\'. Further details at https://experienceleague.adobe.com/docs/experience-manager-cloud-service/implementing/developing/full-stack/overlays.html?lang=en#developing", filePath=jcr_root/libs/cq/test/test.jsp, nodePath=/libs/cq/test/test.jsp') : 'libs violation not found'
4-
assert buildLog.contains('[WARNING] ValidationViolation: "netcentric-aem-cloud: Using mutable nodes in this repository location is not allowed as it is not writable by the underlying service user on a publish instance. Consider to use repoinit scripts instead or move that content to another location. Further details at https://experienceleague.adobe.com/docs/experience-manager-learn/cloud-service/debugging/debugging-aem-as-a-cloud-service/build-and-deployment.html?lang=en#including-%2Fvar-in-content-package", filePath=jcr_root/var/example/test.txt, nodePath=/var/example/test.txt') : 'read only path in mutable package not detected'
5-
assert buildLog.contains('[WARNING] ValidationViolation: "netcentric-aem-cloud: Using install hooks in mutable content packages leads to deployment failures as the underlying service user on the publish does not have the right to execute those.", filePath=META-INF/vault/hooks/vault-hook-example-3.0.0.jar') : 'internal hook violation not found'
6-
assert buildLog.contains('[WARNING] ValidationViolation: "netcentric-aem-cloud: Using install hooks in mutable content packages leads to deployment failures as the underlying service user on the publish does not have the right to execute those.", filePath=META-INF/vault/properties') : 'external hook violation not found'
7-
assert buildLog.contains('[WARNING] ValidationViolation: "netcentric-aem-cloud: Mutable nodes in mixed package types are not installed!", filePath=jcr_root/content/example/test.txt, nodePath=/content/example/test.txt') : 'mutable content in mixed package not found'
3+
assert buildLog.contains("[WARNING] ValidationViolation: \"netcentric-aem-cloud: Nodes below '/libs' may be overwritten by future product upgrades. Rather use '/apps'. Further details at https://experienceleague.adobe.com/docs/experience-manager-cloud-service/implementing/developing/full-stack/overlays.html?lang=en#developing\", filePath=jcr_root${File.separator}libs${File.separator}cq${File.separator}test${File.separator}test.jsp, nodePath=/libs/cq/test/test.jsp") : 'libs violation not found'
4+
assert buildLog.contains("[WARNING] ValidationViolation: \"netcentric-aem-cloud: Using mutable nodes in this repository location is not allowed as it is not writable by the underlying service user on a publish instance. Consider to use repoinit scripts instead or move that content to another location. Further details at https://experienceleague.adobe.com/docs/experience-manager-learn/cloud-service/debugging/debugging-aem-as-a-cloud-service/build-and-deployment.html?lang=en#including-%2Fvar-in-content-package\", filePath=jcr_root${File.separator}var${File.separator}example${File.separator}test.txt, nodePath=/var/example/test.txt") : 'read only path in mutable package not detected'
5+
assert buildLog.contains("[WARNING] ValidationViolation: \"netcentric-aem-cloud: Using install hooks in mutable content packages leads to deployment failures as the underlying service user on the publish does not have the right to execute those.\", filePath=META-INF${File.separator}vault${File.separator}hooks${File.separator}vault-hook-example-3.0.0.jar") : 'internal hook violation not found'
6+
assert buildLog.contains("[WARNING] ValidationViolation: \"netcentric-aem-cloud: Using install hooks in mutable content packages leads to deployment failures as the underlying service user on the publish does not have the right to execute those.\", filePath=META-INF${File.separator}vault${File.separator}properties") : 'external hook violation not found'
7+
assert buildLog.contains("[WARNING] ValidationViolation: \"netcentric-aem-cloud: Mutable nodes in mixed package types are not installed!\", filePath=jcr_root${File.separator}content${File.separator}example${File.separator}test.txt, nodePath=/content/example/test.txt") : 'mutable content in mixed package not found'

0 commit comments

Comments
 (0)