Skip to content

Commit 83e8382

Browse files
committed
Fix yugabytedb on Jammy, combo not compatible with Python chunk tests
1 parent 0910139 commit 83e8382

File tree

3 files changed

+36
-2
lines changed

3 files changed

+36
-2
lines changed

chunks/tool-yugabytedb/Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ARG YB_VERSION
77
ARG YB_BUILD
88
ARG YB_BIN_PATH=/usr/local/yugabyte
99
ARG ROLE=gitpod
10+
ARG PYTHON_VERSION
1011

1112
USER $ROLE
1213
# create bin and data path
@@ -22,6 +23,17 @@ RUN curl -sSLo ./yugabyte.tar.gz https://downloads.yugabyte.com/releases/${YB_VE
2223
&& chmod +x $YB_BIN_PATH/bin/* \
2324
&& rm ./yugabyte.tar.gz
2425

26+
# python is a required dependency of ycqlsh
27+
# but it doesn't support Python 3.10+ due to https://github.com/yugabyte/cqlsh/issues/11, install 3.9 for now
28+
# when building yugabyte combos, if our base is full, related python chunk tests fail
29+
# so, use base as the combo ref, add chunks, but ignore Python chunk and install manually
30+
ENV PATH="$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH"
31+
ENV PYENV_ROOT="$HOME/.pyenv"
32+
RUN git clone https://github.com/pyenv/pyenv.git ~/.pyenv \
33+
&& git -C ~/.pyenv checkout ff93c58babd813066bf2d64d004a5cee33c0f27b \
34+
&& pyenv install ${PYTHON_VERSION} \
35+
&& pyenv global ${PYTHON_VERSION}
36+
2537
# configure the interpreter
2638
RUN ["/usr/local/yugabyte/bin/post_install.sh"]
2739

chunks/tool-yugabytedb/chunk.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ variants:
33
args:
44
YB_VERSION: 2.14.0.0
55
YB_BUILD: 94
6+
PYTHON_VERSION: 3.9
67
- name: "2.15"
78
args:
89
YB_VERSION: 2.15.0.1
910
YB_BUILD: 4
11+
PYTHON_VERSION: 3.9

dazzle.yaml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,33 @@ combiner:
150150
- lang-java:17
151151
- name: yugabytedb
152152
ref:
153-
- full
153+
- base
154154
chunks:
155+
- lang-c
156+
- lang-clojure
157+
- lang-go:1.19.5
158+
- lang-java:11
159+
- lang-node:18
160+
- lang-ruby:3.2
161+
- lang-rust
162+
- tool-brew
163+
- tool-nginx
164+
- tool-nix:2.11.0
155165
- tool-yugabytedb:2.14
156166
- name: yugabytedb-preview
157167
ref:
158-
- full
168+
- base
159169
chunks:
170+
- lang-c
171+
- lang-clojure
172+
- lang-go:1.19.5
173+
- lang-java:11
174+
- lang-node:18
175+
- lang-ruby:3.2
176+
- lang-rust
177+
- tool-brew
178+
- tool-nginx
179+
- tool-nix:2.11.0
160180
- tool-yugabytedb:2.15
161181
envvars:
162182
- name: PATH

0 commit comments

Comments
 (0)