diff --git a/.github/actions/incremental-build/action.yaml b/.github/actions/incremental-build/action.yaml index 8a00177437180..0cda05b500a57 100644 --- a/.github/actions/incremental-build/action.yaml +++ b/.github/actions/incremental-build/action.yaml @@ -31,16 +31,20 @@ inputs: description: 'Flag indicating whether the installation of mvnd should be skipped' required: false default: 'false' + github-repo: + description: 'The GitHub repository name (example, apache/camel)' + required: false + default: 'apache/camel' runs: using: "composite" steps: - id: install-mvnd - uses: ./.github/actions/install-mvnd + uses: apache/camel/.github/actions/install-mvnd@main with: dry-run: ${{ inputs.skip-mvnd-install }} - name: maven build shell: bash - run: ${{ github.action_path }}/incremental-build.sh ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd ${{ inputs.mode }} ${{ inputs.pr-id }} + run: ${{ github.action_path }}/incremental-build.sh ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd ${{ inputs.mode }} ${{ inputs.pr-id }} ${{ inputs.github-repo }} env: GITHUB_TOKEN: ${{ inputs.github-token }} - name: archive logs diff --git a/.github/actions/incremental-build/incremental-build.sh b/.github/actions/incremental-build/incremental-build.sh index c16823489ac0f..23a8993a201b6 100755 --- a/.github/actions/incremental-build/incremental-build.sh +++ b/.github/actions/incremental-build/incremental-build.sh @@ -37,11 +37,12 @@ function findProjectRoot () { function hasLabel() { local issueNumber=${1} local label="incremental-${2}" + local repository=${3} curl -s \ -H "Accept: application/vnd.github+json" \ -H "Authorization: Bearer ${GITHUB_TOKEN}"\ -H "X-GitHub-Api-Version: 2022-11-28" \ - "https://api.github.com/repos/apache/camel/issues/${issueNumber}/labels" | jq -r '.[].name' | grep -c "$label" + "https://api.github.com/repos/${repository}/issues/${issueNumber}/labels" | jq -r '.[].name' | grep -c "$label" } function main() { @@ -50,10 +51,11 @@ function main() { local log="incremental-${mode}.log" local prId=${3} local ret=0 + local repository=${4} echo "Searching for affected projects" local projects - projects=$(curl -s "https://patch-diff.githubusercontent.com/raw/apache/camel/pull/${prId}.diff" | sed -n -e '/^diff --git a/p' | awk '{print $3}' | cut -b 3- | sed 's|\(.*\)/.*|\1|' | uniq | sort) + projects=$(curl -s "https://patch-diff.githubusercontent.com/raw/${repository}/pull/${prId}.diff" | sed -n -e '/^diff --git a/p' | awk '{print $3}' | cut -b 3- | sed 's|\(.*\)/.*|\1|' | uniq | sort) local pl="" local lastProjectRoot="" local buildAll=false @@ -87,7 +89,7 @@ function main() { if [[ ${mode} = "build" ]] ; then local mustBuildAll - mustBuildAll=$(hasLabel ${prId} "build-all") + mustBuildAll=$(hasLabel ${prId} "build-all" ${repository}) if [[ ${mustBuildAll} = "1" ]] ; then echo "The build-all label has been detected thus all projects must be built" buildAll=true @@ -98,7 +100,7 @@ function main() { ret=$? else local buildDependents - buildDependents=$(hasLabel ${prId} "build-dependents") + buildDependents=$(hasLabel ${prId} "build-dependents" ${repository}) local totalTestableProjects if [[ ${buildDependents} = "1" ]] ; then echo "The build-dependents label has been detected thus the projects that depend on the affected projects will be built" @@ -119,7 +121,7 @@ function main() { [[ -z $(git status --porcelain | grep -v antora.yml) ]] || { echo 'There are uncommitted changes'; git status; echo; echo; git diff; exit 1; } else local mustSkipTests - mustSkipTests=$(hasLabel ${prId} "skip-tests") + mustSkipTests=$(hasLabel ${prId} "skip-tests" ${repository}) if [[ ${mustSkipTests} = "1" ]] ; then echo "The skip-tests label has been detected thus no test will be launched" buildAll=true @@ -127,7 +129,7 @@ function main() { echo "Cannot launch the tests of all projects, so no test will be launched" else local testDependents - testDependents=$(hasLabel ${prId} "test-dependents") + testDependents=$(hasLabel ${prId} "test-dependents" ${repository}) local totalTestableProjects if [[ ${testDependents} = "1" ]] ; then echo "The test-dependents label has been detected thus the projects that depend on affected projects will be tested" diff --git a/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java b/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java index 1d3754b6154d3..aaabdc92c2f33 100644 --- a/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java @@ -22,9 +22,11 @@ import org.apache.camel.CamelContext; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import static org.junit.jupiter.api.Assertions.*; +@Isolated("This test is regularly flaky") public class FilterParametersTest extends AbstractJsseParametersTest { @Test diff --git a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java index 6187b4b6396d9..35faf6a57794e 100644 --- a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java @@ -27,9 +27,11 @@ import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultCamelContext; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import static org.junit.jupiter.api.Assertions.*; +@Isolated("This test is regularly flaky") public class KeyManagersParametersTest extends AbstractJsseParametersTest { protected KeyStoreParameters createMinimalKeyStoreParameters() { @@ -63,7 +65,7 @@ public void testPropertyPlaceholders() throws Exception { ksp.setType("{{keyStoreParameters.type}}"); ksp.setProvider("{{keyStoreParameters.provider}}"); ksp.setResource("{{keyStoreParameters.resource}}"); - ksp.setPassword("{{keyStoreParamerers.password}}"); + ksp.setPassword("{{keyStoreParameters.password}}"); KeyManagersParameters kmp = new KeyManagersParameters(); kmp.setCamelContext(context); diff --git a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java index 11e83a1ee4c83..fae068e7b8ee1 100644 --- a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java @@ -56,7 +56,7 @@ public void testPropertyPlaceholders() throws Exception { ksp.setType("{{keyStoreParameters.type}}"); ksp.setProvider("{{keyStoreParameters.provider}}"); ksp.setResource("{{keyStoreParameters.resource}}"); - ksp.setPassword("{{keyStoreParamerers.password}}"); + ksp.setPassword("{{keyStoreParameters.password}}"); KeyStore ks = ksp.createKeyStore(); assertNotNull(ks.getCertificate("localhost")); diff --git a/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java b/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java index 9971e98164652..cdbe21a823c6d 100644 --- a/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java @@ -30,9 +30,11 @@ import org.apache.camel.CamelContext; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import static org.junit.jupiter.api.Assertions.*; +@Isolated("This test is regularly flaky") public class SSLContextParametersTest extends AbstractJsseParametersTest { @Test @@ -68,7 +70,7 @@ public void testPropertyPlaceholders() throws Exception { ksp.setType("{{keyStoreParameters.type}}"); ksp.setProvider("{{keyStoreParameters.provider}}"); ksp.setResource("{{keyStoreParameters.resource}}"); - ksp.setPassword("{{keyStoreParamerers.password}}"); + ksp.setPassword("{{keyStoreParameters.password}}"); KeyManagersParameters kmp = new KeyManagersParameters(); kmp.setCamelContext(camelContext); diff --git a/core/camel-core/src/test/java/org/apache/camel/support/jsse/SecureRandomParametersTest.java b/core/camel-core/src/test/java/org/apache/camel/support/jsse/SecureRandomParametersTest.java index d2bad2472c04c..fa6ebbfd68388 100644 --- a/core/camel-core/src/test/java/org/apache/camel/support/jsse/SecureRandomParametersTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/support/jsse/SecureRandomParametersTest.java @@ -22,10 +22,12 @@ import org.apache.camel.CamelContext; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; +@Isolated("This test is regularly flaky") public class SecureRandomParametersTest extends AbstractJsseParametersTest { @Test diff --git a/core/camel-core/src/test/java/org/apache/camel/support/jsse/TrustManagersParametersTest.java b/core/camel-core/src/test/java/org/apache/camel/support/jsse/TrustManagersParametersTest.java index aa14ad347aa82..95ca1c298b71f 100644 --- a/core/camel-core/src/test/java/org/apache/camel/support/jsse/TrustManagersParametersTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/support/jsse/TrustManagersParametersTest.java @@ -28,10 +28,12 @@ import org.apache.camel.impl.DefaultCamelContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; +import org.junit.jupiter.api.parallel.Isolated; import static org.junit.jupiter.api.Assertions.*; @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Flaky on Github CI") +@Isolated("This test is regularly flaky") public class TrustManagersParametersTest extends AbstractJsseParametersTest { protected KeyStoreParameters createMinimalKeyStoreParameters() { @@ -61,7 +63,7 @@ public void testPropertyPlaceholders() throws Exception { ksp.setType("{{keyStoreParameters.type}}"); ksp.setProvider("{{keyStoreParameters.provider}}"); ksp.setResource("{{keyStoreParameters.resource}}"); - ksp.setPassword("{{keyStoreParamerers.password}}"); + ksp.setPassword("{{keyStoreParameters.password}}"); TrustManagersParameters tmp = new TrustManagersParameters(); tmp.setCamelContext(context); diff --git a/core/camel-core/src/test/resources/org/apache/camel/support/jsse/test.properties b/core/camel-core/src/test/resources/org/apache/camel/support/jsse/test.properties index e4ce2e4e6625b..3979a5f9a147f 100644 --- a/core/camel-core/src/test/resources/org/apache/camel/support/jsse/test.properties +++ b/core/camel-core/src/test/resources/org/apache/camel/support/jsse/test.properties @@ -18,7 +18,7 @@ filterParameters.include=include filterParameters.exclude=exclude keyStoreParameters.resource=org/apache/camel/support/jsse/localhost.p12 -keyStoreParamerers.password=changeit +keyStoreParameters.password=changeit keyManagersParameters.keyPassword=changeit diff --git a/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties b/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties index b16550cc4dca8..1fe8fe2c11437 100644 --- a/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties +++ b/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- -mongodb.container=mongo:7.0.4-jammy \ No newline at end of file +mongodb.container=mongo:7.0.9-jammy \ No newline at end of file