Skip to content

22.8.11 Test Fixes #613

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.

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

Open
wants to merge 7 commits into
base: customizations/22.8.21
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions .github/workflows/regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ jobs:
strategy:
fail-fast: false
matrix:
STORAGE: [minio, aws_s3, gcs, azure]
STORAGE: [minio, aws_s3, gcs]
needs: [runner_labels_setup]
runs-on: ${{ fromJson(needs.runner_labels_setup.outputs.runner_labels) }}
timeout-minutes: ${{ inputs.timeout_minutes }}
Expand Down Expand Up @@ -548,9 +548,6 @@ jobs:
--aws-s3-region ${{ secrets.REGRESSION_AWS_S3_REGION }}
--aws-s3-key-id ${{ secrets.REGRESSION_AWS_S3_KEY_ID }}
--aws-s3-access-key ${{ secrets.REGRESSION_AWS_S3_SECRET_ACCESS_KEY }}
--azure-account-name ${{ secrets.AZURE_ACCOUNT_NAME }}
--azure-storage-key ${{ secrets.AZURE_STORAGE_KEY }}
--azure-container ${{ secrets.AZURE_CONTAINER_NAME }}
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.id="$GITHUB_RUN_ID" job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
${{ env.args }} || EXITCODE=$?;
.github/add_link_to_logs.sh;
Expand Down
37 changes: 34 additions & 3 deletions .github/workflows/release_branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ on: # yamllint disable-line rule:truthy
push:
branches:
- 'releases/22.8**'
workflow_dispatch:

jobs:
DockerHubPushAarch64:
Expand Down Expand Up @@ -362,6 +363,21 @@ jobs:
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
clear-repository: true
- name: Docker IPv6 configuration
shell: bash
run: |
# make sure docker uses proper IPv6 config
sudo touch /etc/docker/daemon.json
sudo chown ubuntu:ubuntu /etc/docker/daemon.json
sudo cat <<EOT > /etc/docker/daemon.json
{
"ipv6": true,
"fixed-cidr-v6": "2001:3984:3989::/64"
}
EOT
sudo chown root:root /etc/docker/daemon.json
sudo systemctl restart docker
sudo systemctl status docker
- name: Functional test
run: |
sudo rm -fr "$TEMP_PATH"
Expand Down Expand Up @@ -452,6 +468,21 @@ jobs:
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
clear-repository: true
- name: Docker IPv6 configuration
shell: bash
run: |
# make sure docker uses proper IPv6 config
sudo touch /etc/docker/daemon.json
sudo chown ubuntu:ubuntu /etc/docker/daemon.json
sudo cat <<EOT > /etc/docker/daemon.json
{
"ipv6": true,
"fixed-cidr-v6": "2001:3984:3989::/64"
}
EOT
sudo chown root:root /etc/docker/daemon.json
sudo systemctl restart docker
sudo systemctl status docker
- name: Functional test
run: |
sudo rm -fr "$TEMP_PATH"
Expand Down Expand Up @@ -635,7 +666,7 @@ jobs:
secrets: inherit
with:
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-app-docker-ce, altinity-setup-regression
commit: 217a4fde343586d50229ff5e24295a02412d1d98
commit: faf60032c142d34829aa5bb93da43075cd1b6832
arch: release
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
timeout_minutes: 300
Expand All @@ -646,8 +677,8 @@ jobs:
secrets: inherit
with:
runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-app-docker-ce, altinity-setup-regression
commit: 217a4fde343586d50229ff5e24295a02412d1d98
arch: release
commit: faf60032c142d34829aa5bb93da43075cd1b6832
arch: aarch64
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
timeout_minutes: 300

Expand Down
70 changes: 39 additions & 31 deletions docker/test/integration/runner/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,39 +60,47 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
RUN dockerd --version; docker --version

RUN python3 -m pip install --no-cache-dir \
PyMySQL \
aerospike==4.0.0 \
avro==1.10.2 \
asyncio \
cassandra-driver \
confluent-kafka==1.5.0 \
dict2xml \
dicttoxml \
docker \
docker-compose==1.29.2 \
grpcio \
grpcio-tools \
kafka-python \
kazoo \
lz4 \
minio \
nats-py \
protobuf \
psycopg2-binary==2.8.6 \
pymongo==3.11.0 \
pytest \
pytest-order==1.0.0 \
pytest-timeout \
pytest-xdist \
pytest-repeat \
PyMySQL~=1.1.0 \
aerospike~=11.1.0 \
asyncio~=3.4.3\
avro~=1.10.2 \
azure-storage-blob~=12.19.0\
cassandra-driver~=3.28.0\
confluent-kafka~=1.9.2 \
delta-spark~=2.3.0 \
dict2xml~=1.7.3 \
dicttoxml~=1.7.16 \
docker~=6.1.3 \
docker-compose~=1.29.2 \
grpcio~=1.59.3 \
grpcio-tools~=1.59.3 \
kafka-python~=2.0.2 \
kazoo~=2.9.0 \
lz4~=4.3.2 \
meilisearch~=0.18.3 \
minio~=7.2.0 \
nats-py~=2.6.0 \
protobuf~=4.25.1 \
psycopg2-binary~=2.9.6 \
pyhdfs~=0.3.1 \
pymongo~=3.11.0 \
pyspark~=3.3.2 \
pytest~=7.4.3 \
pytest-order~=1.0.0 \
pytest-random~=0.2 \
pytest-repeat~=0.9.3 \
pytest-timeout~=2.2.0 \
pytest-xdist~=3.5.0 \
pytz \
redis \
tzlocal==2.1 \
urllib3 \
pyyaml~=5.3.1 \
redis~=5.0.1 \
requests-kerberos \
pyhdfs \
azure-storage-blob \
meilisearch==0.18.3
requests~=2.31.0 \
tzlocal~=2.1 \
retry~=0.9.2 \
bs4~=0.0.1 \
lxml~=4.9.3 \
urllib3~=2.1.0

COPY modprobe.sh /usr/local/bin/modprobe
COPY dockerd-entrypoint.sh /usr/local/bin/
Expand Down
2 changes: 1 addition & 1 deletion docker/test/stateful/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ COPY s3downloader /s3downloader
ENV S3_URL="https://clickhouse-datasets.s3.amazonaws.com"
ENV DATASETS="hits visits"

RUN npm install -g azurite
# RUN npm install -g azurite

COPY run.sh /
CMD ["/bin/bash", "/run.sh"]
Loading