Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/e2e-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
run: |
results_path="$(pwd)/results/$(readlink results/latest | cut -d'/' -f5)"
rm -rf "${{ inputs.storage-path }}/${{ inputs.suite-id }}";mv "${results_path}" "${{ inputs.storage-path }}/${{ inputs.suite-id }}"
if: ${{ success() }}
if: ${{ always() }}
shell: bash
- name: Bring down docker containers
run: ./tests/docker/ducker-ak down
Expand Down
32 changes: 0 additions & 32 deletions .github/workflows/nightly-e2e.yml

This file was deleted.

8 changes: 5 additions & 3 deletions .github/workflows/nightly-extra-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Nightly Extra E2E tests
on:
workflow_dispatch:
schedule:
- cron: '0 19 * * *'
- cron: '0 16 * * *'

jobs:
benchmarks_e2e:
Expand All @@ -18,7 +18,7 @@ jobs:
uses: ./.github/workflows/e2e-run.yml
with:
suite-id: "connect"
test-path: "tests/kafkatest/connect"
test-path: "tests/kafkatest/tests/connect"
storage-path: "/data/github-actions/reports"
runner: "extra"
streams_e2e_1:
Expand All @@ -40,11 +40,13 @@ jobs:
e2e_summary:
name: "E2E Tests Summary"
runs-on: [ self-hosted, extra ]
if: ${{ always() }}
needs: [ benchmarks_e2e, connect_e2e, streams_e2e_1, streams_e2e_2 ]
steps:
- name: Report results
run: python3 tests/report_e2e_results.py
env:
WEB_HOOK_URL: ${{ secrets.E2E_REPORT_WEB_HOOK_URL }}
SHOW_RESULTS_URL: ${{ secrets.E2E_REPORT_SHOW_RESULTS_URL2 }}
STORAGE_PATH: "/data/github-actions/reports"
STORAGE_PATH: "/data/github-actions/reports"
REPORT_TITLE_PREFIX: "Extra"
8 changes: 5 additions & 3 deletions .github/workflows/nightly-main-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Nightly Main E2E tests
on:
workflow_dispatch:
schedule:
- cron: '0 19 * * *'
- cron: '0 16 * * *'

jobs:
main_e2e_1:
Expand All @@ -18,17 +18,19 @@ jobs:
uses: ./.github/workflows/e2e-run.yml
with:
suite-id: "main2"
test-yaml: "tests/suites/extra_kos_test_suite2.yml"
test-yaml: "tests/suites/main_kos_test_suite2.yml"
storage-path: "/data/github-actions/reports"
runner: "main"
e2e_summary:
name: "E2E Tests Summary"
runs-on: [ self-hosted, main ]
if: ${{ always() }}
needs: [ main_e2e_1, main_e2e_2 ]
steps:
- name: Report results
run: python3 tests/report_e2e_results.py
env:
WEB_HOOK_URL: ${{ secrets.E2E_REPORT_WEB_HOOK_URL }}
SHOW_RESULTS_URL: ${{ secrets.E2E_REPORT_SHOW_RESULTS_URL }}
STORAGE_PATH: "/data/github-actions/reports"
STORAGE_PATH: "/data/github-actions/reports"
REPORT_TITLE_PREFIX: "Main"
5 changes: 4 additions & 1 deletion tests/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ RUN apt update && apt install -y sudo git netcat iptables rsync unzip wget curl

# setting mirrors
RUN [ -z "${general_mirror_url}" ] || (pip install -i "https://${general_mirror_url}/pypi/web/simple" pip -U && pip config set global.index-url "https://${general_mirror_url}/pypi/web/simple")
RUN pip3 install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 debugpy awscli && pip3 install --upgrade "ducktape>0.8"
RUN pip3 install --upgrade cffi virtualenv pyasn1 pycrypto pywinrm ipaddress enum34 debugpy && pip3 install --upgrade "ducktape>0.8"
# install awscliv2
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m | sed 's/arm64/aarch64/')-2.15.15.zip" -o "awscliv2.zip" && unzip awscliv2.zip && ./aws/install && rm -rf awscliv2.zip aws


# Set up ssh
COPY ./ssh-config /root/.ssh/config
Expand Down
4 changes: 3 additions & 1 deletion tests/report_e2e_results.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
web_hook_url = os.getenv('WEB_HOOK_URL')
show_results_url = os.getenv('SHOW_RESULTS_URL')
storage_path = os.getenv('STORAGE_PATH')
title_prefix = os.getenv('REPORT_TITLE_PREFIX')
title_prefix = title_prefix if title_prefix else ""

# iterate all the folders in the storage path
base_path = Path(storage_path)
Expand All @@ -50,7 +52,7 @@

post_data = {"msg_type": "interactive", "card": {
"header": {"template": "green",
"title": {"content": "🔈 E2E test results summary", "tag": "plain_text"}},
"title": {"content": "🔈 %s E2E test results summary" % title_prefix, "tag": "plain_text"}},
"elements": [
{"fields": [
{"is_short": True,
Expand Down