diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 01d5218e65..182cb35446 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -27,9 +27,9 @@ jobs: with: maven-version: 3.9.6 - name: Generate coverage with JaCoCo - run: mvn -V --color always -ntp clean verify '-Dgpg.skip' + run: mvn -V --color always -ntp clean verify -Pci --file plugin/pom.xml - name: Upload coverage to Codecov uses: codecov/codecov-action@v4.5.0 with: - files: 'target/site/jacoco/jacoco.xml' + files: 'plugin/target/site/jacoco/jacoco.xml' token: ${{secrets.CODECOV_TOKEN}} diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 19cb237c43..3dd9aa48a2 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -31,7 +31,7 @@ jobs: with: maven-version: 3.9.6 - name: Build warnings plugin and download dependencies - run: mvn -V --color always -ntp verify -Pskip --file plugin/pom.xml -Dgpg.skip + run: mvn -V --color always -ntp verify -Pskip --file plugin/pom.xml - name: Run UI tests ${{ matrix.test }} on ${{ matrix.browser }} env: BROWSER: ${{ matrix.browser }} diff --git a/ui-tests/pom.xml b/ui-tests/pom.xml index e637ef5bfa..031e47fdb4 100644 --- a/ui-tests/pom.xml +++ b/ui-tests/pom.xml @@ -48,7 +48,7 @@ org.jenkins-ci acceptance-test-harness - 5814.vdc5d6d484b_40 + 5883.vdea_99c1762a_d com.fasterxml.jackson.core diff --git a/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/GitForensicsUiTest.java b/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/GitForensicsUiTest.java index fb04a071a1..2fa9589bed 100644 --- a/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/GitForensicsUiTest.java +++ b/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/GitForensicsUiTest.java @@ -1,6 +1,7 @@ package io.jenkins.plugins.analysis.warnings; import java.io.IOException; +import java.net.MalformedURLException; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; @@ -37,6 +38,7 @@ @WithPlugins({"git", "git-forensics"}) @WithCredentials(credentialType = WithCredentials.SSH_USERNAME_PRIVATE_KEY, values = {"gitplugin", "/org/jenkinsci/test/acceptance/docker/fixtures/GitContainer/unsafe"}) @SuppressFBWarnings("BC") +@SuppressWarnings("checkstyle:ClassFanOutComplexity") public class GitForensicsUiTest extends UiTest { @Inject @SuppressWarnings("CdiInjectionPointsInspection") @@ -110,10 +112,15 @@ private Map commitDifferentFilesToGitRepository(final GitRepo re @SuppressFBWarnings("BC_UNCONFIRMED_CAST_OF_RETURN_VALUE") @SuppressWarnings("PMD.CloseResource") public void initGitRepository() { - GitContainer gitContainer = gitServer.get(); - repoUrl = gitContainer.getRepoUrl(); - host = gitContainer.host(); - port = gitContainer.port(); + try { + GitContainer gitContainer = gitServer.get(); + repoUrl = gitContainer.getRepoUrl(); + host = gitContainer.host(); + port = gitContainer.port(); + } + catch (MalformedURLException exception) { + throw new AssertionError("Could not initialize GitContainer", exception); + } } /** Dispose the docker container. */