Skip to content

Commit 20aa414

Browse files
committed
Various improvements for tests (#20)
* tests-improvements-1: Add clickhouse_setup into platform name Add a note about gcloud helper for molecule Bump default debian version to 12 ci: tests with specific clickhouse version
2 parents 1719afc + 069652c commit 20aa414

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ jobs:
5353
- name: ubuntu
5454
version: "24.04"
5555
setup: client
56+
- name: ubuntu
57+
version: "24.04"
58+
clickhouse_version: "24.9.2.42"
5659
steps:
5760
- name: Checkout
5861
uses: actions/checkout@v4
@@ -74,4 +77,5 @@ jobs:
7477
DISTRO_NAME=${{ matrix.distro.name }}
7578
DISTRO_VER=${{ matrix.distro.version }}
7679
CLICKHOUSE_SETUP=${{ matrix.distro.setup }}
80+
CLICKHOUSE_VER=${{ matrix.distro.clickhouse_version }}
7781
molecule test

Documentation/Tests.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,20 @@ DISTRO_NAME=debian DISTRO_VER=12 CLICKHOUSE_VER=23.10.6.60 molecule test
4040
# Use ANSIBLE_VERBOSITY to increase ansible output verbosity
4141
ANSIBLE_VERBOSITY=3 molecule test
4242
```
43+
44+
#### Note about `gcloud` helper for `docker`
45+
46+
If you are using `gcloud` helper, then you may need to fix `$CLOUDSDK_PYTHON`:
47+
48+
```
49+
$ echo $CLOUDSDK_PYTHON
50+
/usr/bin/python
51+
export CLOUDSDK_PYTHON=python
52+
```
53+
54+
Otherwise system-wide python interpreter may not work:
55+
56+
```
57+
$ echo "gcr.io" | /opt/google-cloud-cli/bin/docker-credential-gcloud get
58+
ERROR: gcloud crashed (AttributeError): module 'google._upb._message' has no attribute 'MessageMapContainer'
59+
```

molecule/default/molecule.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ driver:
55
name: docker
66

77
platforms:
8-
- name: "clickhouse-${DISTRO_NAME:-debian}-${DISTRO_VER:-10}-${CLICKHOUSE_VER:-latest}-${CI_JOB_ID:-0}"
9-
image: "${DISTRO_NAME:-debian}:${DISTRO_VER:-10}"
8+
- name: "clickhouse-${DISTRO_NAME:-debian}-${DISTRO_VER:-12}-${CLICKHOUSE_VER:-latest}-${CLICKHOUSE_SETUP:-full}-${CI_JOB_ID:-0}"
9+
image: "${DISTRO_NAME:-debian}:${DISTRO_VER:-12}"
1010
dockerfile: ../resources/Dockerfile.j2
1111
cgroupns_mode: host
1212
sysctls:

0 commit comments

Comments
 (0)