thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 01:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update CI config

Browse Source
This commit is contained in:
Antonio Andelic 2022-11-07 08:49:26 +00:00
parent 291e8931c1
commit 8e1a4bcf9a
10 changed files with 14 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
.github/workflows/pull_request.yml vendored
View File

@ -32,70 +32,6 @@ jobs:
run: |
cd "$GITHUB_WORKSPACE/tests/ci"
python3 run_check.py
DockerHubPushAarch64:
needs: CheckLabels
runs-on: [self-hosted, style-checker-aarch64]
steps:
- name: Clear repository
run: |
sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
- name: Check out repository code
uses: actions/checkout@v2
- name: Images check
run: |
cd "$GITHUB_WORKSPACE/tests/ci"
python3 docker_images_check.py --suffix aarch64
- name: Upload images files to artifacts
uses: actions/upload-artifact@v2
with:
name: changed_images_aarch64
path: ${{ runner.temp }}/docker_images_check/changed_images_aarch64.json
DockerHubPushAmd64:
needs: CheckLabels
runs-on: [self-hosted, style-checker]
steps:
- name: Clear repository
run: |
sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
- name: Check out repository code
uses: actions/checkout@v2
- name: Images check
run: |
cd "$GITHUB_WORKSPACE/tests/ci"
python3 docker_images_check.py --suffix amd64
- name: Upload images files to artifacts
uses: actions/upload-artifact@v2
with:
name: changed_images_amd64
path: ${{ runner.temp }}/docker_images_check/changed_images_amd64.json
DockerHubPush:
needs: [DockerHubPushAmd64, DockerHubPushAarch64]
runs-on: [self-hosted, style-checker]
steps:
- name: Clear repository
run: |
sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
- name: Check out repository code
uses: actions/checkout@v2
- name: Download changed aarch64 images
uses: actions/download-artifact@v2
with:
name: changed_images_aarch64
path: ${{ runner.temp }}
- name: Download changed amd64 images
uses: actions/download-artifact@v2
with:
name: changed_images_amd64
path: ${{ runner.temp }}
- name: Images check
run: |
cd "$GITHUB_WORKSPACE/tests/ci"
python3 docker_manifests_merge.py --suffix amd64 --suffix aarch64
- name: Upload images files to artifacts
uses: actions/upload-artifact@v2
with:
name: changed_images
path: ${{ runner.temp }}/changed_images.json
#############################################################################################
###################################### JEPSEN TESTS #########################################
#############################################################################################
@ -104,11 +40,11 @@ jobs:
# When it's skipped, all dependent tasks will be skipped too.
# DO NOT add it there
if: contains(github.event.pull_request.labels.*.name, 'jepsen-test')
needs: [DockerHubPush]
needs: [CheckLabels]
uses: ./.github/workflows/jepsen.yml
FinishCheck:
needs:
- DockerHubPush
- CheckLabels
runs-on: [self-hosted, style-checker]
steps:
- name: Clear repository

2
docker/test/server-jepsen/Dockerfile
View File

@ -12,7 +12,7 @@ ENV SHA_TO_TEST=""
ENV NODES_USERNAME="root"
ENV NODES_PASSWORD=""
ENV TESTS_TO_RUN="30"
ENV TESTS_TO_RUN="1"
ENV TIME_LIMIT="30"
ENV KEEPER_NODE=""

3
tests/ci/ci_config.py
View File

@ -347,6 +347,9 @@ CI_CONFIG = {
"ClickHouse Keeper Jepsen": {
"required_build": "binary_release",
},
"ClickHouse Server Jepsen": {
"required_build": "binary_release",
},
"Performance Comparison": {
"required_build": "package_release",
"test_grep_exclude_filter": "",

2
tests/ci/jepsen_check.py
View File

@ -194,7 +194,7 @@ if __name__ == "__main__":
os.makedirs(result_path)
instances = prepare_autoscaling_group_and_get_hostnames(KEEPER_DESIRED_INSTANCE_COUNT if args.program == 'keeper' else SERVER_DESIRED_INSTANCE_COUNT)
nodes_path = save_nodes_to_file(instances[:SERVER_DESIRED_INSTANCE_COUNT - 1], TEMP_PATH)
nodes_path = save_nodes_to_file(instances[:KEEPER_DESIRED_INSTANCE_COUNT], TEMP_PATH)
# always use latest
docker_image = KEEPER_IMAGE_NAME if args.program == 'keeper' else SERVER_IMAGE_NAME

2
tests/jepsen.clickhouse/resources/config.xml
View File

@ -1,5 +1,5 @@
<clickhouse>
<listen_host>0.0.0.0</listen_host>
<listen_host>::</listen_host>
<tcp_port>9000</tcp_port>
<http_port>8123</http_port>

2
tests/jepsen.clickhouse/resources/keeper_config.xml
View File

@ -1,5 +1,5 @@
<clickhouse>
<listen_host>0.0.0.0</listen_host>
<listen_host>::</listen_host>
<logger>
<level>trace</level>

2
tests/jepsen.clickhouse/resources/keeper_config_solo.xml
View File

@ -1,5 +1,5 @@
<clickhouse>
<listen_host>0.0.0.0</listen_host>
<listen_host>::</listen_host>
<logger>
<level>trace</level>

4
tests/jepsen.clickhouse/src/jepsen/clickhouse/server/client.clj
View File

@ -22,12 +22,12 @@
(util/timeout 30000
(throw (RuntimeException.
(str "Connection to " node " timed out")))
(util/retry 0.1
;(util/retry 0.1
(let [spec (db-spec node)
connection (j/get-connection spec)
added-connection (j/add-connection spec connection)]
(assert added-connection)
added-connection))))
added-connection)))
(defn close-connection
"Close connection"

2
tests/jepsen.clickhouse/src/jepsen/clickhouse/server/utils.clj
View File

@ -11,7 +11,7 @@
(let [c (chc/open-connection node)]
(jdbc/query c "SELECT 1")
(chc/close-connection c))
(catch Exception _ false)))
(catch Exception e (do (info e) false))))
(defn start-clickhouse!
[node test]

1
tests/jepsen.clickhouse/src/jepsen/clickhouse/utils.clj
View File

@ -132,6 +132,7 @@
:chdir data-dir}
binary-path
binary-args)
(info "Waiting for server")
(wait-clickhouse-alive! node test clickhouse-alive?)))
(defn prepare-dirs