Skip to content

Commit e928478

Browse files
aw-was-hereaw-was-here
committed
YETUS-1271. Upgrade to Ubuntu 24.04 (Noble)
1 parent ed83f87 commit e928478

89 files changed

Lines changed: 819 additions & 942 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@ version: 2
1919
jobs:
2020
build:
2121
docker:
22-
- image: ghcr.io/apache/yetus:main
22+
- image: ghcr.io/effectivemachines/buretoolbox:main
2323

2424
working_directory: ~/repo
2525

2626
environment:
2727
# Customize the JVM maximum heap limit
2828
MAVEN_OPTS: -Xmx3200m
29-
# Set JAVA_HOME
30-
JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
29+
JAVA_HOME: /usr/lib/jvm/default-java
3130

3231
steps:
3332
- checkout
@@ -38,7 +37,6 @@ jobs:
3837
- run: >
3938
~/repo/precommit/src/main/shell/test-patch.sh
4039
--plugins=all
41-
--java-home=/usr/lib/jvm/java-11-openjdk-amd64
4240
--patch-dir=/tmp/yetus-out
4341
--html-report-file=/tmp/yetus-out/report.html
4442
--console-report-file=/tmp/yetus-out/console.txt

‎.cirrus.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717

1818
yetus_task:
1919
container:
20-
image: ghcr.io/apache/yetus:main
20+
image: ghcr.io/effectivemachines/buretoolbox:main
21+
env:
22+
JAVA_HOME: /usr/lib/jvm/default-java
2123
test_script: >
2224
${CIRRUS_WORKING_DIR}/precommit/src/main/shell/test-patch.sh
2325
--basedir="${CIRRUS_WORKING_DIR}"
@@ -26,7 +28,6 @@ yetus_task:
2628
--console-report-file=/tmp/yetus-out/console.txt
2729
--csv-report-file=/tmp/yetus-out/report.csv
2830
--html-report-file=/tmp/yetus-out/report.html
29-
--java-home=/usr/lib/jvm/java-11-openjdk-amd64
3031
--junit-report-xml=/tmp/yetus-out/junit.xml
3132
--plugins=all
3233
--junit-report-xml=line

‎.github/workflows/action-test.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ jobs:
3838
uses: apache/yetus-test-patch-action@main
3939
with:
4040
basedir: ./src
41-
javahome: /usr/lib/jvm/java-11-openjdk-amd64
4241
patchdir: ./out
4342
buildtool: maven
4443
githubtoken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/yetus.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,9 @@ jobs:
4848
--console-report-file="${GITHUB_WORKSPACE}/out/console.txt"
4949
--csv-report-file="${GITHUB_WORKSPACE}/out/report.csv"
5050
--docker
51-
--docker-cache-from=ghcr.io/apache/yetus-base:main
51+
--docker-cache-from=ghcr.io/effectivemachines/buretoolbox:main
5252
--github-token="${{ secrets.GITHUB_TOKEN }}"
5353
--html-report-file="${GITHUB_WORKSPACE}/out/report.html"
54-
--java-home=/usr/lib/jvm/java-11-openjdk-amd64
5554
--junit-report-xml="${GITHUB_WORKSPACE}/out/junit-report.xml"
5655
--patch-dir="${GITHUB_WORKSPACE}/out"
5756
--plugins=all

‎.gitlab-ci.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
---
1717

1818
buretoolbox-job:
19-
image: ghcr.io/apache/yetus:main
19+
image: ghcr.io/effectivemachines/buretoolbox:main
2020
allow_failure: true
21+
variables:
22+
JAVA_HOME: /usr/lib/jvm/default-java
2123
script:
2224
- >
2325
precommit/src/main/shell/test-patch.sh
2426
--patch-dir=/tmp/yetus-out
2527
--plugins=all
26-
--java-home=/usr/lib/jvm/java-11-openjdk-amd64
2728
--html-report-file=/tmp/yetus-out/report.html
2829
--csv-report-file=/tmp/yetus-out/report.csv
2930
--console-report-file=/tmp/yetus-out/console.txt

‎.travis.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ script:
3030
precommit/src/main/shell/test-patch.sh
3131
--docker
3232
--patch-dir=/tmp/yetus-out
33-
--java-home=/usr/lib/jvm/java-11-openjdk-amd64
3433
--plugins=all,-detsecrets
35-
--docker-cache-from=ghcr.io/apache/yetus:main
34+
--docker-cache-from=ghcr.io/effectivemachines/buretoolbox:main
3635
--html-report-file=/tmp/yetus-out/report.html
3736
--console-report-file=/tmp/yetus-out/console.txt
3837
--brief-report-file=/tmp/yetus-out/brief.txt

‎Jenkinsfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ pipeline {
9595
# enable writing back to Github
9696
YETUS_ARGS+=(--github-token="${GITHUB_TOKEN}")
9797
98-
YETUS_ARGS+=(--java-home=/usr/lib/jvm/java-11-openjdk-amd64)
9998
10099
# enable writing back to ASF JIRA
101100
YETUS_ARGS+=(--jira-issue-re='^YETUS-[0-9]*$')
@@ -133,10 +132,10 @@ pipeline {
133132
# run in docker mode and specifically point to our
134133
# Dockerfile since we don't want to use the auto-pulled version.
135134
if [[ "${USE_DOCKER_FLAG}" == true ]]; then
136-
docker pull ubuntu:jammy
135+
docker pull ubuntu:noble
137136
YETUS_ARGS+=("--docker")
138137
YETUS_ARGS+=("--dockerfile=${YETUS_DOCKERFILE}")
139-
YETUS_ARGS+=("--docker-cache-from=ghcr.io/apache/yetus-base:main")
138+
YETUS_ARGS+=("--docker-cache-from=ghcr.io/effectivemachines/buretoolbox:main")
140139
else
141140
# need to figure this out programmatically; hard-coded for now
142141
export JAVA_HOME=/home/jenkins/tools/java/latest1.8

‎asf-site-src/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RUN apt-get -q update \
4848
RUN echo "export GPG_TTY=\$(tty)" >> /root/.bashrc
4949
# hadolint disable=DL3059
5050
RUN groupadd --non-unique -g "${GROUP_ID}" "${USER_NAME}" \
51-
&& useradd -l -g "${GROUP_ID}" -u "${USER_ID}" -k /root -m "${USER_NAME}"
51+
&& useradd --non-unique -l -g "${GROUP_ID}" -u "${USER_ID}" -k /root -m "${USER_NAME}"
5252
# hadolint disable=DL3059,SC2039,SC1117
5353
RUN echo -e "${USER_NAME}\\tALL=NOPASSWD: ALL" > "/etc/sudoers.d/yetus-build-${USER_ID}" # pragma: allowlist secret
5454
ENV HOME=/home/${USER_NAME}
@@ -79,10 +79,9 @@ ENV GEM_HOME=${BUNDLE_PATH}
7979
# pre-install most of the middleman stack to save time
8080
# on re-launches
8181
# hadolint ignore=DL3028
82-
RUN gem install bundler \
83-
middleman:'4.5.0' \
82+
RUN gem install bundler:'4.0.8' \
83+
middleman:'4.6.3' \
8484
middleman-syntax \
85-
nokogiri:1.15.4 \
8685
sassc:2.4.0 \
8786
tzinfo-data
8887

‎asf-site-src/Gemfile.lock‎

Lines changed: 92 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,153 @@
11
GIT
22
remote: https://github.com/middleman/middleman-syntax.git
3-
revision: 2d44853d28766850db2ca800e880270fa7dd8ad6
3+
revision: 89aab5386c40bb99cfe670396e53c334d7ea3460
44
specs:
5-
middleman-syntax (3.4.0)
5+
middleman-syntax (3.6.1)
66
middleman-core (>= 3.2)
7-
rouge (~> 3.2)
7+
rouge (>= 3.2, < 5)
88

99
GEM
1010
remote: https://rubygems.org/
1111
specs:
12-
activesupport (7.0.8.7)
13-
concurrent-ruby (~> 1.0, >= 1.0.2)
12+
activesupport (8.1.3)
13+
base64
14+
bigdecimal
15+
concurrent-ruby (~> 1.0, >= 1.3.1)
16+
connection_pool (>= 2.2.5)
17+
drb
1418
i18n (>= 1.6, < 2)
19+
json
20+
logger (>= 1.4.2)
1521
minitest (>= 5.1)
16-
tzinfo (~> 2.0)
17-
addressable (2.8.7)
18-
public_suffix (>= 2.0.2, < 7.0)
19-
backports (3.25.0)
22+
securerandom (>= 0.3)
23+
tzinfo (~> 2.0, >= 2.0.5)
24+
uri (>= 0.13.1)
25+
addressable (2.8.9)
26+
public_suffix (>= 2.0.2, < 8.0)
27+
base64 (0.3.0)
28+
bigdecimal (4.1.0)
2029
coffee-script (2.4.1)
2130
coffee-script-source
2231
execjs
2332
coffee-script-source (1.12.2)
24-
concurrent-ruby (1.3.4)
25-
contracts (0.16.1)
26-
dotenv (3.1.7)
33+
concurrent-ruby (1.3.6)
34+
connection_pool (3.0.2)
35+
contracts (0.17.3)
36+
dotenv (3.2.0)
37+
drb (2.2.3)
2738
em-websocket (0.5.3)
2839
eventmachine (>= 0.12.9)
2940
http_parser.rb (~> 0)
30-
erubis (2.7.0)
41+
erubi (1.13.1)
3142
eventmachine (1.2.7)
3243
execjs (2.10.0)
3344
fast_blank (1.0.1)
34-
fastimage (2.4.0)
35-
ffi (1.17.1)
45+
fastimage (2.4.1)
46+
ffi (1.17.4-aarch64-linux-gnu)
47+
ffi (1.17.4-arm64-darwin)
48+
ffi (1.17.4-x86_64-darwin)
49+
ffi (1.17.4-x86_64-linux-gnu)
3650
haml (5.2.2)
3751
temple (>= 0.8.0)
3852
tilt
3953
hamster (3.0.0)
4054
concurrent-ruby (~> 1.0)
41-
hashie (3.6.0)
42-
http_parser.rb (0.8.0)
43-
i18n (1.6.0)
55+
hashie (5.1.0)
56+
logger
57+
http_parser.rb (0.8.1)
58+
i18n (1.14.8)
4459
concurrent-ruby (~> 1.0)
45-
kramdown (2.5.1)
46-
rexml (>= 3.3.9)
60+
json (2.19.3)
61+
kramdown (2.5.2)
62+
rexml (>= 3.4.4)
4763
kramdown-parser-gfm (1.1.0)
4864
kramdown (~> 2.0)
49-
libv8-node (21.7.2.0-aarch64-linux)
50-
libv8-node (21.7.2.0-arm64-darwin)
51-
libv8-node (21.7.2.0-x86_64-darwin)
52-
libv8-node (21.7.2.0-x86_64-linux)
53-
listen (3.9.0)
65+
libv8-node (24.12.0.1-aarch64-linux)
66+
libv8-node (24.12.0.1-arm64-darwin)
67+
libv8-node (24.12.0.1-x86_64-darwin)
68+
libv8-node (24.12.0.1-x86_64-linux)
69+
listen (3.10.0)
70+
logger
5471
rb-fsevent (~> 0.10, >= 0.10.3)
5572
rb-inotify (~> 0.9, >= 0.9.10)
73+
logger (1.7.0)
5674
memoist (0.16.2)
57-
middleman (4.5.1)
58-
coffee-script (~> 2.2)
59-
haml (>= 4.0.5)
60-
kramdown (>= 2.3.0)
61-
middleman-cli (= 4.5.1)
62-
middleman-core (= 4.5.1)
63-
middleman-cli (4.5.1)
64-
thor (>= 0.17.0, < 1.3.0)
65-
middleman-core (4.5.1)
66-
activesupport (>= 6.1, < 7.1)
75+
middleman (4.6.3)
76+
middleman-cli (= 4.6.3)
77+
middleman-core (= 4.6.3)
78+
middleman-cli (4.6.3)
79+
thor (>= 0.17.0, < 2)
80+
middleman-core (4.6.3)
81+
activesupport (>= 6.1)
6782
addressable (~> 2.4)
68-
backports (~> 3.6)
69-
bundler (~> 2.0)
70-
contracts (~> 0.13, < 0.17)
83+
bundler (> 2.0)
84+
coffee-script (~> 2.2)
85+
contracts
7186
dotenv
72-
erubis
87+
erubi
7388
execjs (~> 2.0)
7489
fast_blank
7590
fastimage (~> 2.0)
91+
haml (>= 4.0.5, < 7)
7692
hamster (~> 3.0)
77-
hashie (~> 3.4)
78-
i18n (~> 1.6.0)
93+
hashie (>= 3.4, < 6.0)
94+
i18n (>= 1.6, < 1.15)
95+
kramdown (~> 2.4)
7996
listen (~> 3.0)
8097
memoist (~> 0.14)
81-
padrino-helpers (~> 0.15.0)
98+
padrino-helpers (>= 0.15, < 0.17)
8299
parallel
83-
rack (>= 1.4.5, < 3)
100+
rack (>= 3)
101+
rackup
84102
sassc (~> 2.0)
85103
servolux
86-
tilt (~> 2.0.9)
104+
tilt (~> 2.2)
87105
toml
88-
uglifier (~> 3.0)
106+
uglifier (>= 3, < 5)
89107
webrick
90-
middleman-livereload (3.4.7)
108+
middleman-livereload (3.5.0)
91109
em-websocket (~> 0.5.1)
92110
middleman-core (>= 3.3)
93-
rack-livereload (~> 0.3.15)
94-
mini_racer (0.12.0)
95-
libv8-node (~> 21.7.2.0)
96-
minitest (5.25.4)
97-
padrino-helpers (0.15.3)
111+
rack-livereload (~> 0.6.1)
112+
mini_racer (0.20.0)
113+
libv8-node (~> 24.12.0.1)
114+
minitest (6.0.2)
115+
drb (~> 2.0)
116+
prism (~> 1.5)
117+
padrino-helpers (0.16.1)
98118
i18n (>= 0.6.7, < 2)
99-
padrino-support (= 0.15.3)
100-
tilt (>= 1.4.1, < 3)
101-
padrino-support (0.15.3)
102-
parallel (1.26.3)
119+
padrino-support (= 0.16.1)
120+
tilt (>= 2.1, < 3)
121+
padrino-support (0.16.1)
122+
parallel (1.27.0)
103123
parslet (2.0.0)
104-
public_suffix (6.0.1)
105-
rack (2.2.22)
106-
rack-livereload (0.3.17)
107-
rack
124+
prism (1.9.0)
125+
public_suffix (7.0.5)
126+
rack (3.1.20)
127+
rack-livereload (0.6.1)
128+
rack (>= 3.0, < 3.2)
129+
rackup (2.3.1)
130+
rack (>= 3)
108131
rb-fsevent (0.11.2)
109132
rb-inotify (0.11.1)
110133
ffi (~> 1.0)
111-
rexml (3.4.2)
112-
rouge (3.30.0)
134+
rexml (3.4.4)
135+
rouge (4.7.0)
113136
sassc (2.4.0)
114137
ffi (~> 1.9)
138+
securerandom (0.4.1)
115139
servolux (0.13.0)
116-
temple (0.10.3)
117-
thor (1.2.2)
118-
tilt (2.0.11)
140+
temple (0.10.4)
141+
thor (1.5.0)
142+
tilt (2.7.0)
119143
toml (0.3.0)
120144
parslet (>= 1.8.0, < 3.0.0)
121145
tzinfo (2.0.6)
122146
concurrent-ruby (~> 1.0)
123-
uglifier (3.2.0)
147+
uglifier (4.2.1)
124148
execjs (>= 0.3.0, < 3)
125-
webrick (1.9.1)
149+
uri (1.1.1)
150+
webrick (1.9.2)
126151

127152
PLATFORMS
128153
aarch64-linux
@@ -141,4 +166,4 @@ DEPENDENCIES
141166
wdm (~> 0.1.0)
142167

143168
BUNDLED WITH
144-
2.5.23
169+
4.0.8

‎asf-site-src/config.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# limitations under the License.
1818
#
1919

20-
require 'ruby27_fix_uri'
2120
require 'kramdown-parser-gfm'
2221

2322
set :markdown_engine, :kramdown

0 commit comments

Comments
 (0)