Skip to content

Commit ed13768

Browse files
lhotarisrinath-ctds
lhotari
authored and
srinath-ctds
committed
[improve][ci] Upgrade GitHub Actions workflows to use ubuntu-24.04 (apache#24841)
(cherry picked from commit 2233fa8) (cherry picked from commit 37af467)
1 parent dcccbb9 commit ed13768

File tree

9 files changed

+29
-27
lines changed

9 files changed

+29
-27
lines changed

‎.github/workflows/ci-documentbot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: (github.repository == 'apache/pulsar') && (github.event.pull_request.state == 'open')
3737
permissions:
3838
pull-requests: write
39-
runs-on: ubuntu-22.04
39+
runs-on: ubuntu-24.04
4040
steps:
4141
- name: Labeling
4242
uses: apache/pulsar-test-infra/docbot@master

‎.github/workflows/ci-go-functions.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ env:
3838
jobs:
3939
preconditions:
4040
name: Preconditions
41-
runs-on: ubuntu-22.04
41+
runs-on: ubuntu-24.04
4242
outputs:
4343
docs_only: ${{ steps.check_changes.outputs.docs_only }}
4444
steps:
@@ -73,7 +73,7 @@ jobs:
7373
needs: preconditions
7474
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
7575
name: Go ${{ matrix.go-version }} Functions style check
76-
runs-on: ubuntu-22.04
76+
runs-on: ubuntu-24.04
7777
strategy:
7878
matrix:
7979
go-version: ['1.23']

‎.github/workflows/ci-maven-cache-update.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
matrix:
6060
include:
6161
- name: all modules
62-
runs-on: ubuntu-22.04
62+
runs-on: ubuntu-24.04
6363
cache_name: 'm2-dependencies-all'
6464
mvn_arguments: ''
6565

@@ -68,7 +68,7 @@ jobs:
6868
cache_name: 'm2-dependencies-all'
6969

7070
- name: core-modules
71-
runs-on: ubuntu-22.04
71+
runs-on: ubuntu-24.04
7272
cache_name: 'm2-dependencies-core-modules'
7373
mvn_arguments: '-Pcore-modules,-main'
7474

‎.github/workflows/ci-owasp-dependency-check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
env:
3636
JOB_NAME: Check ${{ matrix.branch }}
3737
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
38-
runs-on: ubuntu-22.04
38+
runs-on: ubuntu-24.04
3939
timeout-minutes: 75
4040
strategy:
4141
fail-fast: false

‎.github/workflows/ci-pulsarbot.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424

2525
jobs:
2626
pulsarbot:
27-
runs-on: ubuntu-22.04
27+
runs-on: ubuntu-24.04
2828
timeout-minutes: 10
2929
if: github.event_name == 'issue_comment' && contains(github.event.comment.body, '/pulsarbot')
3030
steps:

‎.github/workflows/pulsar-ci-flaky.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ env:
8787
jobs:
8888
preconditions:
8989
name: Preconditions
90-
runs-on: ubuntu-22.04
90+
runs-on: ubuntu-24.04
9191
outputs:
9292
docs_only: ${{ steps.check_changes.outputs.docs_only }}
9393
changed_tests: ${{ steps.changes.outputs.tests_files }}
@@ -176,7 +176,7 @@ jobs:
176176
THREAD_LEAK_DETECTOR_DIR: ${{ github.workspace }}/target/thread-leak-dumps
177177
NETTY_LEAK_DETECTION: "${{ needs.preconditions.outputs.netty_leak_detection }}"
178178
NETTY_LEAK_DUMP_DIR: ${{ github.workspace }}/target/netty-leak-dumps
179-
runs-on: ubuntu-22.04
179+
runs-on: ubuntu-24.04
180180
timeout-minutes: 100
181181
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
182182
steps:

‎.github/workflows/pulsar-ci.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ env:
8787
jobs:
8888
preconditions:
8989
name: Preconditions
90-
runs-on: ubuntu-22.04
90+
runs-on: ubuntu-24.04
9191
outputs:
9292
docs_only: ${{ steps.check_changes.outputs.docs_only }}
9393
changed_tests: ${{ steps.changes.outputs.tests_files }}
@@ -169,7 +169,7 @@ jobs:
169169
JOB_NAME: Build and License check
170170
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
171171
CI_JDK_MAJOR_VERSION: ${{ needs.preconditions.outputs.jdk_major_version }}
172-
runs-on: ubuntu-22.04
172+
runs-on: ubuntu-24.04
173173
timeout-minutes: 60
174174
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
175175
steps:
@@ -252,7 +252,7 @@ jobs:
252252
THREAD_LEAK_DETECTOR_DIR: ${{ github.workspace }}/target/thread-leak-dumps
253253
NETTY_LEAK_DETECTION: "${{ needs.preconditions.outputs.netty_leak_detection }}"
254254
NETTY_LEAK_DUMP_DIR: ${{ github.workspace }}/target/netty-leak-dumps
255-
runs-on: ubuntu-22.04
255+
runs-on: ubuntu-24.04
256256
timeout-minutes: ${{ matrix.timeout || 60 }}
257257
needs: ['preconditions', 'build-and-license-check']
258258
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
@@ -407,7 +407,7 @@ jobs:
407407

408408
unit-tests-upload-coverage:
409409
name: CI - Unit - Upload Coverage
410-
runs-on: ubuntu-22.04
410+
runs-on: ubuntu-24.04
411411
timeout-minutes: 30
412412
needs: ['preconditions', 'unit-tests']
413413
env:
@@ -489,7 +489,7 @@ jobs:
489489

490490
pulsar-java-test-image:
491491
name: Build Pulsar java-test-image docker image
492-
runs-on: ubuntu-22.04
492+
runs-on: ubuntu-24.04
493493
timeout-minutes: 60
494494
needs: ['preconditions', 'build-and-license-check']
495495
if: ${{ needs.preconditions.outputs.docs_only != 'true'}}
@@ -571,7 +571,7 @@ jobs:
571571

572572
integration-tests:
573573
name: CI - Integration - ${{ matrix.name }}
574-
runs-on: ubuntu-22.04
574+
runs-on: ubuntu-24.04
575575
timeout-minutes: ${{ matrix.timeout || 60 }}
576576
needs: ['preconditions', 'pulsar-java-test-image']
577577
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
@@ -774,7 +774,7 @@ jobs:
774774

775775
integration-tests-upload-coverage:
776776
name: CI - Integration - Upload Coverage
777-
runs-on: ubuntu-22.04
777+
runs-on: ubuntu-24.04
778778
timeout-minutes: 30
779779
needs: ['preconditions', 'integration-tests']
780780
if: ${{ needs.preconditions.outputs.collect_coverage == 'true' }}
@@ -861,7 +861,7 @@ jobs:
861861

862862
delete-integration-test-docker-image-artifact:
863863
name: "Delete integration test docker image artifact"
864-
runs-on: ubuntu-22.04
864+
runs-on: ubuntu-24.04
865865
timeout-minutes: 10
866866
needs: [
867867
'preconditions',
@@ -885,7 +885,7 @@ jobs:
885885
886886
pulsar-test-latest-version-image:
887887
name: Build Pulsar docker image
888-
runs-on: ubuntu-22.04
888+
runs-on: ubuntu-24.04
889889
timeout-minutes: 60
890890
needs: ['preconditions', 'build-and-license-check']
891891
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
@@ -1009,7 +1009,7 @@ jobs:
10091009

10101010
system-tests:
10111011
name: CI - System - ${{ matrix.name }}
1012-
runs-on: ubuntu-22.04
1012+
runs-on: ubuntu-24.04
10131013
timeout-minutes: 60
10141014
needs: ['preconditions', 'pulsar-test-latest-version-image']
10151015
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
@@ -1171,7 +1171,7 @@ jobs:
11711171

11721172
system-tests-upload-coverage:
11731173
name: CI - System - Upload Coverage
1174-
runs-on: ubuntu-22.04
1174+
runs-on: ubuntu-24.04
11751175
timeout-minutes: 30
11761176
needs: ['preconditions', 'system-tests']
11771177
if: ${{ needs.preconditions.outputs.collect_coverage == 'true' }}
@@ -1259,7 +1259,7 @@ jobs:
12591259

12601260
flaky-system-tests:
12611261
name: CI Flaky - System - ${{ matrix.name }}
1262-
runs-on: ubuntu-22.04
1262+
runs-on: ubuntu-24.04
12631263
timeout-minutes: 60
12641264
needs: [ 'preconditions', 'pulsar-test-latest-version-image' ]
12651265
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
@@ -1398,7 +1398,7 @@ jobs:
13981398

13991399
delete-system-test-docker-image-artifact:
14001400
name: "Delete system test docker image artifact"
1401-
runs-on: ubuntu-22.04
1401+
runs-on: ubuntu-24.04
14021402
timeout-minutes: 10
14031403
needs: [
14041404
'preconditions',
@@ -1459,7 +1459,7 @@ jobs:
14591459

14601460
codeql:
14611461
name: Run CodeQL Analysis
1462-
runs-on: ubuntu-22.04
1462+
runs-on: ubuntu-24.04
14631463
timeout-minutes: 60
14641464
needs: ['preconditions', 'unit-tests']
14651465
if: ${{ (needs.preconditions.outputs.java_non_tests == 'true' || github.event_name != 'pull_request') && ((github.event_name == 'pull_request' && github.base_ref == 'master') || (github.event_name != 'pull_request' && github.ref_name == 'master')) }}
@@ -1524,7 +1524,7 @@ jobs:
15241524

15251525
owasp-dep-check:
15261526
name: OWASP dependency check
1527-
runs-on: ubuntu-22.04
1527+
runs-on: ubuntu-24.04
15281528
timeout-minutes: 120
15291529
needs: [ 'preconditions', 'integration-tests' ]
15301530
if: ${{ needs.preconditions.outputs.need_owasp == 'true' }}
@@ -1630,7 +1630,7 @@ jobs:
16301630
# this is to allow the workflow scheduled jobs to show as cancelled instead of failed since scheduled
16311631
# jobs are not enabled for other than apache/pulsar repository.
16321632
if: ${{ always() && !(cancelled() && github.repository != 'apache/pulsar' && github.event_name == 'schedule') }}
1633-
runs-on: ubuntu-22.04
1633+
runs-on: ubuntu-24.04
16341634
timeout-minutes: 10
16351635
needs: [
16361636
'preconditions',

‎build/run_unit_group.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ function test_group_other() {
174174
-pl '!com.datastax.oss:distribution,!com.datastax.oss:pulsar-offloader-distribution,!com.datastax.oss:pulsar-server-distribution,!com.datastax.oss:pulsar-io-distribution,!com.datastax.oss:pulsar-all-docker-image,!com.datastax.oss:pulsar-experimental-docker-image' \
175175
-PskipTestsForUnitGroupOther -DdisableIoMainProfile=true -DskipIntegrationTests \
176176
-Dexclude='**/ManagedLedgerTest.java,
177-
**/OffloadersCacheTest.java
177+
**/OffloadersCacheTest.java,
178+
**/OffsetsCacheTest.java,
178179
**/PrimitiveSchemaTest.java,
179180
**/BlobStoreManagedLedgerOffloaderTest.java,
180181
**/BlobStoreManagedLedgerOffloaderStreamingTest.java'
@@ -184,6 +185,7 @@ function test_group_other() {
184185

185186
mvn_test -pl tiered-storage/jcloud -Dinclude='**/BlobStoreManagedLedgerOffloaderTest.java'
186187
mvn_test -pl tiered-storage/jcloud -Dinclude='**/BlobStoreManagedLedgerOffloaderStreamingTest.java'
188+
mvn_test -pl tiered-storage/jcloud -Dinclude='**/OffsetsCacheTest.java'
187189

188190
echo "::endgroup::"
189191
local modules_with_quarantined_tests=$(git grep -l '@Test.*"quarantine"' | grep '/src/test/java/' | \

‎tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/OffsetsCacheTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void testCache() throws Exception {
3838
// test ttl
3939
offsetsCache.put(1, 2, 2);
4040
assertEquals(offsetsCache.getIfPresent(1, 2), 2);
41-
Thread.sleep(1500);
41+
Thread.sleep(2000);
4242
assertNull(offsetsCache.getIfPresent(1, 2));
4343
offsetsCache.close();
4444
}

0 commit comments

Comments
 (0)