Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update airbase to 235 #134

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update airbase to 235 #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e5510a
Update airbase to 235
wendigo Mar 19, 2025
fb4be3f
Test on JDK 23 and 24-ea
wendigo Mar 19, 2025
e1b66c1
Use docker compose instead of docker-compose
wendigo Mar 19, 2025
a7ada22
Update groovy to 4.0.26
wendigo Mar 19, 2025
3b24a79
Update testing docker images
wendigo Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: ['21', '22']
java: ['23', '24-ea']
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.airlift</groupId>
<artifactId>airbase</artifactId>
<version>157</version>
<version>235</version>
</parent>

<groupId>io.trino.tempto</groupId>
Expand Down Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-bom</artifactId>
<version>4.0.21</version>
<version>4.0.26</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions tempto-examples/bin/run_on_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ function termination_handler(){
}

SCRIPT_DIR=$(dirname $(absolutepath "$0"))
DOCKER_COMPOSE="docker-compose -f ${SCRIPT_DIR}/../docker/docker-compose.yml"
DOCKER_COMPOSE="docker compose -f ${SCRIPT_DIR}/../docker/docker-compose.yml"

source "${SCRIPT_DIR}/../target/classes/tempto.env"

# check docker and docker compose installation
docker-compose version
docker compose version
docker version

trap termination_handler INT TERM
Expand All @@ -91,7 +91,7 @@ ${DOCKER_COMPOSE} pull --quiet

${DOCKER_COMPOSE} build
${DOCKER_COMPOSE} up -d
${DOCKER_COMPOSE} logs --no-color trino-master cassandra hadoop-master psql1 psql2 ssh kafka &
${DOCKER_COMPOSE} logs -f -t --no-color trino-master cassandra hadoop-master psql1 psql2 ssh kafka &

retry check_hive
retry check_trino
Expand Down
2 changes: 1 addition & 1 deletion tempto-examples/docker/ssh/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/trinodb/testing/centos7-oj11:53
FROM ghcr.io/trinodb/testing/almalinux9-oj17:108

RUN yum install -y openssh-server openssh-clients passwd
RUN echo s3cr37_p@55 | passwd --stdin root
Expand Down
4 changes: 2 additions & 2 deletions tempto-examples/docker/trino-cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/trinodb/testing/centos7-oj11:53
FROM ghcr.io/trinodb/testing/almalinux9-oj17:108

RUN curl -SL https://repo1.maven.org/maven2/io/trino/trino-cli/356/trino-cli-356-executable.jar -o trino-cli.jar
RUN curl -SL https://repo1.maven.org/maven2/io/trino/trino-cli/472/trino-cli-472-executable.jar -o trino-cli.jar

14 changes: 3 additions & 11 deletions tempto-examples/docker/trino-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
FROM ghcr.io/trinodb/testing/centos7-oj11:53
FROM trinodb/trino:472

RUN yum install -y tar
COPY etc /etc/trino

RUN curl -SL https://repo1.maven.org/maven2/io/trino/trino-server/356/trino-server-356.tar.gz \
| tar xz \
&& mv $(find -type d -name 'trino-server*') trino-server

RUN mkdir /trino-server/etc

COPY etc /trino-server/etc/

CMD /trino-server/bin/launcher run
CMD /usr/lib/trino/bin/run-trino
1 change: 0 additions & 1 deletion tempto-examples/docker/trino-server/etc/jvm.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
-server
-Xmx2G
-XX:-UseBiasedLocking
-XX:+UseG1GC
-XX:G1HeapRegionSize=32M
-XX:+ExplicitGCInvokesConcurrent
Expand Down
Loading