From 93494eb97493445c6a47910d0d0f664dd31dd138 Mon Sep 17 00:00:00 2001 From: ac892247 Date: Mon, 4 Nov 2024 13:43:11 +0100 Subject: [PATCH] enabled debug logs Signed-off-by: ac892247 --- .github/workflows/integration-tests.yml | 6 +++--- gradle/jib.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 66bd26349f..b3e25359d8 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -1487,8 +1487,8 @@ jobs: path: GatewayProxy - uses: actions/download-artifact@v4 with: - name: CITestsZaas-${{ env.JOB_ID }} - path: CITestsZaas + name: ContainerCITestsZaas-${{ env.JOB_ID }} + path: ContainerCITestsZaas - uses: actions/download-artifact@v4 with: name: CITestsWebSocketChaoticHA-${{ env.JOB_ID }} @@ -1500,7 +1500,7 @@ jobs: - name: Code coverage and publish results run: > - ./gradlew --info coverage sonar -Dresults="containercitests/results,citestswithinfinispan/results,GatewayProxy/results,citestswebsocketchaoticha/results,GatewayServiceRouting/results,CITestsZaas/results" + ./gradlew --info coverage sonar -Dresults="containercitests/results,citestswithinfinispan/results,GatewayProxy/results,citestswebsocketchaoticha/results,GatewayServiceRouting/results,ContainerCITestsZaas/results" -Psonar.host.url=$SONAR_HOST_URL -Dsonar.token=$SONAR_TOKEN -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_PASSWORD env: ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} diff --git a/gradle/jib.gradle b/gradle/jib.gradle index a9e5b7eb00..9479e774b3 100644 --- a/gradle/jib.gradle +++ b/gradle/jib.gradle @@ -7,7 +7,7 @@ def setJib(componentName, javaAgentPort, debugPort) { jib.to.image = imageName jib.to.auth.username = project.hasProperty("zowe.docker.username") ? project.getProperty("zowe.docker.username") : "" jib.to.auth.password = project.hasProperty("zowe.docker.password") ? project.getProperty("zowe.docker.password") : "" - jib.container.args = ['--spring.config.additional-location=file:/docker/' + componentName + '.yml', '--spring.profiles.include=dev,debug'] + jib.container.args = ['-Dspring.config.additional-location=file:/docker/' + componentName + '.yml', '-Dspring.profiles.include=dev,debug'] jib.container.jvmFlags = javaAgentOptions + addOpensOptions jib.extraDirectories.paths = ['../config', '../keystore', '../scripts'] }