Skip to content

Commit b2d220b

Browse files
lhotarinodece
lhotari
authored and
nodece
committed
[improve][ci] Upgrade GitHub Actions workflows to use ubuntu-24.04 (apache#24841)
(cherry picked from commit 2233fa8)
1 parent 1fbbaca commit b2d220b

File tree

10 files changed

+29
-27
lines changed

10 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
@@ -58,7 +58,7 @@ jobs:
5858
matrix:
5959
include:
6060
- name: all modules
61-
runs-on: ubuntu-22.04
61+
runs-on: ubuntu-24.04
6262
cache_name: 'm2-dependencies-all'
6363
mvn_arguments: ''
6464

@@ -67,7 +67,7 @@ jobs:
6767
cache_name: 'm2-dependencies-all'
6868

6969
- name: core-modules
70-
runs-on: ubuntu-22.04
70+
runs-on: ubuntu-24.04
7171
cache_name: 'm2-dependencies-core-modules'
7272
mvn_arguments: '-Pcore-modules,-main'
7373

‎.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/ci-stale-issue-pr.yaml‎

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

66
jobs:
77
stale:
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-24.04
99
steps:
1010
- uses: actions/stale@v4
1111
with:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ env:
4646
jobs:
4747
preconditions:
4848
name: Preconditions
49-
runs-on: ubuntu-22.04
49+
runs-on: ubuntu-24.04
5050
if: (github.event_name != 'schedule') || (github.repository == 'apache/pulsar')
5151
outputs:
5252
docs_only: ${{ steps.check_changes.outputs.docs_only }}
@@ -96,7 +96,7 @@ jobs:
9696
JOB_NAME: Flaky tests suite
9797
COLLECT_COVERAGE: "${{ needs.preconditions.outputs.collect_coverage }}"
9898
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
99-
runs-on: ubuntu-22.04
99+
runs-on: ubuntu-24.04
100100
timeout-minutes: 100
101101
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
102102
steps:

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ env:
4646
jobs:
4747
preconditions:
4848
name: Preconditions
49-
runs-on: ubuntu-22.04
49+
runs-on: ubuntu-24.04
5050
if: (github.event_name != 'schedule') || (github.repository == 'apache/pulsar')
5151
outputs:
5252
docs_only: ${{ steps.check_changes.outputs.docs_only }}
@@ -97,7 +97,7 @@ jobs:
9797
env:
9898
JOB_NAME: Build and License check
9999
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
100-
runs-on: ubuntu-22.04
100+
runs-on: ubuntu-24.04
101101
timeout-minutes: 60
102102
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
103103
steps:
@@ -173,7 +173,7 @@ jobs:
173173
JOB_NAME: CI - Unit - ${{ matrix.name }}
174174
COLLECT_COVERAGE: "${{ needs.preconditions.outputs.collect_coverage }}"
175175
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
176-
runs-on: ubuntu-22.04
176+
runs-on: ubuntu-24.04
177177
timeout-minutes: ${{ matrix.timeout || 60 }}
178178
needs: ['preconditions', 'build-and-license-check']
179179
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
@@ -307,7 +307,7 @@ jobs:
307307

308308
unit-tests-upload-coverage:
309309
name: CI - Unit - Upload Coverage
310-
runs-on: ubuntu-22.04
310+
runs-on: ubuntu-24.04
311311
timeout-minutes: 30
312312
needs: ['preconditions', 'unit-tests']
313313
if: ${{ needs.preconditions.outputs.collect_coverage == 'true' }}
@@ -387,7 +387,7 @@ jobs:
387387

388388
pulsar-java-test-image:
389389
name: Build Pulsar java-test-image docker image
390-
runs-on: ubuntu-22.04
390+
runs-on: ubuntu-24.04
391391
timeout-minutes: 60
392392
needs: ['preconditions', 'build-and-license-check']
393393
if: ${{ needs.preconditions.outputs.docs_only != 'true'}}
@@ -459,7 +459,7 @@ jobs:
459459

460460
integration-tests:
461461
name: CI - Integration - ${{ matrix.name }}
462-
runs-on: ubuntu-22.04
462+
runs-on: ubuntu-24.04
463463
timeout-minutes: ${{ matrix.timeout || 60 }}
464464
needs: ['preconditions', 'pulsar-java-test-image']
465465
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
@@ -621,7 +621,7 @@ jobs:
621621

622622
integration-tests-upload-coverage:
623623
name: CI - Integration - Upload Coverage
624-
runs-on: ubuntu-22.04
624+
runs-on: ubuntu-24.04
625625
timeout-minutes: 30
626626
needs: ['preconditions', 'integration-tests']
627627
if: ${{ needs.preconditions.outputs.collect_coverage == 'true' }}
@@ -707,7 +707,7 @@ jobs:
707707

708708
delete-integration-test-docker-image-artifact:
709709
name: "Delete integration test docker image artifact"
710-
runs-on: ubuntu-22.04
710+
runs-on: ubuntu-24.04
711711
timeout-minutes: 10
712712
needs: [
713713
'preconditions',
@@ -731,7 +731,7 @@ jobs:
731731
732732
pulsar-test-latest-version-image:
733733
name: Build Pulsar docker image
734-
runs-on: ubuntu-22.04
734+
runs-on: ubuntu-24.04
735735
timeout-minutes: 60
736736
needs: ['preconditions', 'build-and-license-check']
737737
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
@@ -839,7 +839,7 @@ jobs:
839839

840840
system-tests:
841841
name: CI - System - ${{ matrix.name }}
842-
runs-on: ubuntu-22.04
842+
runs-on: ubuntu-24.04
843843
timeout-minutes: 60
844844
needs: ['preconditions', 'pulsar-test-latest-version-image']
845845
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
@@ -984,7 +984,7 @@ jobs:
984984

985985
system-tests-upload-coverage:
986986
name: CI - System - Upload Coverage
987-
runs-on: ubuntu-22.04
987+
runs-on: ubuntu-24.04
988988
timeout-minutes: 30
989989
needs: ['preconditions', 'system-tests']
990990
if: ${{ needs.preconditions.outputs.collect_coverage == 'true' }}
@@ -1071,7 +1071,7 @@ jobs:
10711071

10721072
flaky-system-tests:
10731073
name: CI Flaky - System - ${{ matrix.name }}
1074-
runs-on: ubuntu-22.04
1074+
runs-on: ubuntu-24.04
10751075
timeout-minutes: 60
10761076
needs: [ 'preconditions', 'pulsar-test-latest-version-image' ]
10771077
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
@@ -1190,7 +1190,7 @@ jobs:
11901190

11911191
delete-system-test-docker-image-artifact:
11921192
name: "Delete system test docker image artifact"
1193-
runs-on: ubuntu-22.04
1193+
runs-on: ubuntu-24.04
11941194
timeout-minutes: 10
11951195
needs: [
11961196
'preconditions',
@@ -1250,7 +1250,7 @@ jobs:
12501250

12511251
owasp-dep-check:
12521252
name: OWASP dependency check
1253-
runs-on: ubuntu-22.04
1253+
runs-on: ubuntu-24.04
12541254
timeout-minutes: 120
12551255
needs: [ 'preconditions', 'integration-tests' ]
12561256
if: ${{ needs.preconditions.outputs.need_owasp == 'true' }}
@@ -1350,7 +1350,7 @@ jobs:
13501350
pulsar-ci-checks-completed:
13511351
name: "Pulsar CI checks completed"
13521352
if: ${{ always() && ((github.event_name != 'schedule') || (github.repository == 'apache/pulsar')) }}
1353-
runs-on: ubuntu-22.04
1353+
runs-on: ubuntu-24.04
13541354
timeout-minutes: 10
13551355
needs: [
13561356
'preconditions',

‎build/run_unit_group.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ function test_group_other() {
168168
-pl '!org.apache.pulsar:distribution,!org.apache.pulsar:pulsar-offloader-distribution,!org.apache.pulsar:pulsar-server-distribution,!org.apache.pulsar:pulsar-io-distribution,!org.apache.pulsar:pulsar-all-docker-image' \
169169
-PskipTestsForUnitGroupOther -DdisableIoMainProfile=true -DdisableSqlMainProfile=true -DskipIntegrationTests \
170170
-Dexclude='**/ManagedLedgerTest.java,
171-
**/OffloadersCacheTest.java
171+
**/OffloadersCacheTest.java,
172+
**/OffsetsCacheTest.java,
172173
**/PrimitiveSchemaTest.java,
173174
**/BlobStoreManagedLedgerOffloaderTest.java,
174175
**/BlobStoreManagedLedgerOffloaderStreamingTest.java'
@@ -178,6 +179,7 @@ function test_group_other() {
178179

179180
mvn_test -pl tiered-storage/jcloud -Dinclude='**/BlobStoreManagedLedgerOffloaderTest.java'
180181
mvn_test -pl tiered-storage/jcloud -Dinclude='**/BlobStoreManagedLedgerOffloaderStreamingTest.java'
182+
mvn_test -pl tiered-storage/jcloud -Dinclude='**/OffsetsCacheTest.java'
181183

182184
echo "::endgroup::"
183185
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)