From ca30077186a58e7d817a5994612b195cf6dc005a Mon Sep 17 00:00:00 2001 From: Peter Adams Date: Wed, 30 Oct 2024 15:28:28 +0000 Subject: [PATCH] Remove unused dockerfiles and allocation limit scripts Motivation: Remove unused clutter Modifications: Remove dockerfiles and scripts to update allocation limits. Result: Cleaner repo --- dev/alloc-limits-from-test-output | 88 ----------------- ...te-alloc-limits-to-last-completed-ci-build | 45 --------- docker/Dockerfile | 27 ------ docker/docker-compose.2204.510.yaml | 95 ------------------- docker/docker-compose.2204.58.yaml | 92 ------------------ docker/docker-compose.2204.59.yaml | 95 ------------------- docker/docker-compose.2204.main.yaml | 91 ------------------ docker/docker-compose.2204.nightly-6.0.yaml | 90 ------------------ docker/docker-compose.yaml | 77 --------------- 9 files changed, 700 deletions(-) delete mode 100755 dev/alloc-limits-from-test-output delete mode 100755 dev/update-alloc-limits-to-last-completed-ci-build delete mode 100644 docker/Dockerfile delete mode 100644 docker/docker-compose.2204.510.yaml delete mode 100644 docker/docker-compose.2204.58.yaml delete mode 100644 docker/docker-compose.2204.59.yaml delete mode 100644 docker/docker-compose.2204.main.yaml delete mode 100644 docker/docker-compose.2204.nightly-6.0.yaml delete mode 100644 docker/docker-compose.yaml diff --git a/dev/alloc-limits-from-test-output b/dev/alloc-limits-from-test-output deleted file mode 100755 index 1be492499b2..00000000000 --- a/dev/alloc-limits-from-test-output +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash -##===----------------------------------------------------------------------===## -## -## This source file is part of the SwiftNIO open source project -## -## Copyright (c) 2021 Apple Inc. and the SwiftNIO project authors -## Licensed under Apache License v2.0 -## -## See LICENSE.txt for license information -## See CONTRIBUTORS.txt for the list of SwiftNIO project authors -## -## SPDX-License-Identifier: Apache-2.0 -## -##===----------------------------------------------------------------------===## - -# This script allows you to consume any Jenkins/alloc counter run output and -# convert it into the right for for the docker-compose script. - -set -eu - -mode_flag=${1---docker-compose} - -function usage() { - echo >&1 "Usage: $0 [--docker-compose|--export]" - echo >&1 - echo >&1 "Example:" - echo >&1 " # copy the output from the Jenkins CI into your clipboard, then" - echo >&1 " pbpaste | $0 --docker-compose" -} - -function die() { - echo >&2 "ERROR: $*" - exit 1 -} - -case "$mode_flag" in - --docker-compose) - mode=docker - ;; - --export) - mode=export - ;; - *) - usage - exit 1 - ;; -esac - -function allow_slack() { - raw="$1" - if [[ ! "$raw" =~ ^[0-9]+$ ]]; then - die "not a malloc count: '$raw'" - fi - if [[ "$raw" -lt 1000 ]]; then - echo "$raw" - return - fi - - allocs=$raw - while true; do - allocs=$(( allocs + 1 )) - if [[ "$allocs" =~ [0-9]+00$ || "$allocs" =~ [0-9]+50$ ]]; then - echo "$allocs" - return - fi - done -} - -grep -e "total number of mallocs" -e ".total_allocations" -e "export MAX_ALLOCS_ALLOWED_" | \ - sed -e "s/: total number of mallocs: /=/g" \ - -e "s/.total_allocations: /=/g" \ - -e "s/info: /test_/g" \ - -e "s/export MAX_ALLOCS_ALLOWED_/test_/g" | \ - grep -Eo 'test_[a-zA-Z0-9_-]+=[0-9]+' | sort | uniq | while read info; do - test_name=$(echo "$info" | sed "s/test_//g" | cut -d= -f1 ) - allocs=$(allow_slack "$(echo "$info" | cut -d= -f2 | sed "s/ //g")") - case "$mode" in - docker) - echo " - MAX_ALLOCS_ALLOWED_$test_name=$allocs" - ;; - export) - echo "export MAX_ALLOCS_ALLOWED_$test_name=$allocs" - ;; - *) - die "Unexpected mode: $mode" - ;; - esac -done diff --git a/dev/update-alloc-limits-to-last-completed-ci-build b/dev/update-alloc-limits-to-last-completed-ci-build deleted file mode 100755 index c40865b3dc7..00000000000 --- a/dev/update-alloc-limits-to-last-completed-ci-build +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -##===----------------------------------------------------------------------===## -## -## This source file is part of the SwiftNIO open source project -## -## Copyright (c) 2021 Apple Inc. and the SwiftNIO project authors -## Licensed under Apache License v2.0 -## -## See LICENSE.txt for license information -## See CONTRIBUTORS.txt for the list of SwiftNIO project authors -## -## SPDX-License-Identifier: Apache-2.0 -## -##===----------------------------------------------------------------------===## - -set -eu -set -o pipefail - -here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -url_prefix=${1-"https://ci.swiftserver.group/job/swift-nio2-swift"} -target_repo=${2-"$here/.."} -tmpdir=$(mktemp -d /tmp/.last-build_XXXXXX) - -for f in 57 58 59 510 -nightly; do - echo "swift$f" - url="$url_prefix$f-prb/lastCompletedBuild/consoleFull" - echo "$url" - curl -s "$url" | "$here/alloc-limits-from-test-output" > "$tmpdir/limits$f" - - if [[ "$(wc -l < "$tmpdir/limits$f")" -lt 5 ]]; then - echo >&2 "ERROR: fewer than 5 limits found, something's not right" - exit 1 - fi - - docker_file=$(if [[ "$f" == "-nightly" ]]; then f=main; fi && ls "$target_repo/docker/docker-compose."*"$f"*".yaml") - - echo "$docker_file" - cat "$tmpdir/limits$f" - cat "$docker_file" | grep -v MAX_ALLOCS_ALLOWED | grep -B10000 "^ environment:" > "$tmpdir/pre$f" - cat "$docker_file" | grep -v MAX_ALLOCS_ALLOWED | grep -A10000 "^ environment:" | sed 1d > "$tmpdir/post$f" - cat "$tmpdir/pre$f" "$tmpdir/limits$f" "$tmpdir/post$f" > "$docker_file" -done - -rm -rf "$tmpdir" diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 3de64437b41..00000000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -ARG swift_version=5.7 -ARG ubuntu_version=jammy -ARG base_image=swift:$swift_version-$ubuntu_version -FROM $base_image -# needed to do again after FROM due to docker limitation -ARG swift_version -ARG ubuntu_version - -# set as UTF-8 -RUN apt-get update && apt-get install -y locales locales-all -ENV LC_ALL en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US.UTF-8 - -# dependencies -RUN apt-get update && apt-get install -y wget -RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools curl jq # used by integration tests - -# ruby -RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev build-essential - -# install jemalloc for running allocation benchmarks -RUN apt-get update & apt-get install -y libjemalloc-dev - -# tools -RUN mkdir -p $HOME/.tools -RUN echo 'export PATH="$HOME/.tools:$PATH"' >> $HOME/.profile diff --git a/docker/docker-compose.2204.510.yaml b/docker/docker-compose.2204.510.yaml deleted file mode 100644 index f9f8bf5a35b..00000000000 --- a/docker/docker-compose.2204.510.yaml +++ /dev/null @@ -1,95 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-nio:22.04-5.10 - build: - args: - ubuntu_version: "jammy" - swift_version: "5.10" - - unit-tests: - image: swift-nio:22.04-5.10 - - integration-tests: - image: swift-nio:22.04-5.10 - - documentation-check: - image: swift-nio:22.04-5.10 - - test: - image: swift-nio:22.04-5.10 - environment: - - SWIFT_VERSION=5.10 - - MAX_ALLOCS_ALLOWED_10000000_asyncsequenceproducer=19 - - MAX_ALLOCS_ALLOWED_1000000_asyncwriter=1000050 - - MAX_ALLOCS_ALLOWED_1000_addHandlers=43050 - - MAX_ALLOCS_ALLOWED_1000_addHandlers_sync=36050 - - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlercontext=8050 - - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlername=8050 - - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlertype=8050 - - MAX_ALLOCS_ALLOWED_1000_autoReadGetAndSet=18050 - - MAX_ALLOCS_ALLOWED_1000_autoReadGetAndSet_sync=0 - - MAX_ALLOCS_ALLOWED_1000_copying_bytebufferview_to_array=1050 - - MAX_ALLOCS_ALLOWED_1000_copying_circularbuffer_to_array=1050 - - MAX_ALLOCS_ALLOWED_1000_getHandlers=8050 - - MAX_ALLOCS_ALLOWED_1000_getHandlers_sync=34 - - MAX_ALLOCS_ALLOWED_1000_reqs_1_conn=26400 - - MAX_ALLOCS_ALLOWED_1000_rst_connections=145050 - - MAX_ALLOCS_ALLOWED_1000_tcpbootstraps=3050 - - MAX_ALLOCS_ALLOWED_1000_tcpconnections=152050 - - MAX_ALLOCS_ALLOWED_1000_udp_reqs=6050 - - MAX_ALLOCS_ALLOWED_1000_udpbootstraps=2050 - - MAX_ALLOCS_ALLOWED_1000_udpconnections=75050 - - MAX_ALLOCS_ALLOWED_1_reqs_1000_conn=389050 - - MAX_ALLOCS_ALLOWED_bytebuffer_lots_of_rw=2050 - - MAX_ALLOCS_ALLOWED_creating_10000_headers=0 - - MAX_ALLOCS_ALLOWED_decode_1000_ws_frames=2050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer=3 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_mask=2050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_space=3 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_space_with_mask=2050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer=3050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_mask=5050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_space=3050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_space_with_mask=5050 - - MAX_ALLOCS_ALLOWED_execute_hop_10000_tasks=0 - - MAX_ALLOCS_ALLOWED_future_erase_result=4050 - - MAX_ALLOCS_ALLOWED_future_lots_of_callbacks=53050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form=700050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace=700050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace_from_long_string=700050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace_from_short_string=700050 - - MAX_ALLOCS_ALLOWED_modifying_1000_circular_buffer_elements=0 - - MAX_ALLOCS_ALLOWED_modifying_byte_buffer_view=6050 - - MAX_ALLOCS_ALLOWED_ping_pong_1000_reqs_1_conn=319 - - MAX_ALLOCS_ALLOWED_read_10000_chunks_from_file=110050 - - MAX_ALLOCS_ALLOWED_schedule_10000_tasks=40100 - - MAX_ALLOCS_ALLOWED_schedule_and_run_10000_tasks=50050 - - MAX_ALLOCS_ALLOWED_scheduling_10000_executions=89 - - MAX_ALLOCS_ALLOWED_udp_1000_reqs_1_conn=6200 - - MAX_ALLOCS_ALLOWED_udp_1_reqs_1000_conn=162050 - - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors - - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error - # - SANITIZER_ARG=--sanitize=thread # TSan broken still - - performance-test: - image: swift-nio:22.04-5.10 - - update-benchmark-baseline: - image: swift-nio:22.04-5.10 - environment: - - SWIFT_VERSION=5.10 - - shell: - image: swift-nio:22.04-5.10 - - echo: - image: swift-nio:22.04-5.10 - - http: - image: swift-nio:22.04-5.10 - - cxx-interop-build: - image: swift-nio:22.04-5.10 diff --git a/docker/docker-compose.2204.58.yaml b/docker/docker-compose.2204.58.yaml deleted file mode 100644 index 9ced32b04d5..00000000000 --- a/docker/docker-compose.2204.58.yaml +++ /dev/null @@ -1,92 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-nio:22.04-5.8 - build: - args: - ubuntu_version: "jammy" - swift_version: "5.8" - - unit-tests: - image: swift-nio:22.04-5.8 - - integration-tests: - image: swift-nio:22.04-5.8 - - documentation-check: - image: swift-nio:22.04-5.8 - - test: - image: swift-nio:22.04-5.8 - environment: - - SWIFT_VERSION=5.8 - - MAX_ALLOCS_ALLOWED_10000000_asyncsequenceproducer=20 - - MAX_ALLOCS_ALLOWED_1000000_asyncwriter=1000050 - - MAX_ALLOCS_ALLOWED_1000_addHandlers=43050 - - MAX_ALLOCS_ALLOWED_1000_addHandlers_sync=36050 - - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlercontext=8050 - - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlername=8050 - - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlertype=8050 - - MAX_ALLOCS_ALLOWED_1000_autoReadGetAndSet=18050 - - MAX_ALLOCS_ALLOWED_1000_autoReadGetAndSet_sync=0 - - MAX_ALLOCS_ALLOWED_1000_copying_bytebufferview_to_array=1050 - - MAX_ALLOCS_ALLOWED_1000_copying_circularbuffer_to_array=1050 - - MAX_ALLOCS_ALLOWED_1000_getHandlers=8050 - - MAX_ALLOCS_ALLOWED_1000_getHandlers_sync=34 - - MAX_ALLOCS_ALLOWED_1000_reqs_1_conn=26400 - - MAX_ALLOCS_ALLOWED_1000_rst_connections=147050 - - MAX_ALLOCS_ALLOWED_1000_tcpbootstraps=4050 - - MAX_ALLOCS_ALLOWED_1000_tcpconnections=154050 - - MAX_ALLOCS_ALLOWED_1000_udp_reqs=6050 - - MAX_ALLOCS_ALLOWED_1000_udpbootstraps=2050 - - MAX_ALLOCS_ALLOWED_1000_udpconnections=75050 - - MAX_ALLOCS_ALLOWED_1_reqs_1000_conn=398050 - - MAX_ALLOCS_ALLOWED_bytebuffer_lots_of_rw=2050 - - MAX_ALLOCS_ALLOWED_creating_10000_headers=0 - - MAX_ALLOCS_ALLOWED_decode_1000_ws_frames=2050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer=3 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_mask=2050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_space=3 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_space_with_mask=2050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer=3050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_mask=5050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_space=3050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_space_with_mask=5050 - - MAX_ALLOCS_ALLOWED_execute_hop_10000_tasks=0 - - MAX_ALLOCS_ALLOWED_future_erase_result=4050 - - MAX_ALLOCS_ALLOWED_future_lots_of_callbacks=53050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form=700050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace=700050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace_from_long_string=700050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace_from_short_string=700050 - - MAX_ALLOCS_ALLOWED_modifying_1000_circular_buffer_elements=0 - - MAX_ALLOCS_ALLOWED_modifying_byte_buffer_view=6050 - - MAX_ALLOCS_ALLOWED_ping_pong_1000_reqs_1_conn=334 - - MAX_ALLOCS_ALLOWED_read_10000_chunks_from_file=110050 - - MAX_ALLOCS_ALLOWED_schedule_10000_tasks=40100 - - MAX_ALLOCS_ALLOWED_schedule_and_run_10000_tasks=50050 - - MAX_ALLOCS_ALLOWED_scheduling_10000_executions=89 - - MAX_ALLOCS_ALLOWED_udp_1000_reqs_1_conn=6200 - - MAX_ALLOCS_ALLOWED_udp_1_reqs_1000_conn=162050 - - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors - - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error - # - SANITIZER_ARG=--sanitize=thread # TSan broken still - - performance-test: - image: swift-nio:22.04-5.8 - - update-benchmark-baseline: - image: swift-nio:22.04-5.8 - environment: - - SWIFT_VERSION=5.8 - - shell: - image: swift-nio:22.04-5.8 - - echo: - image: swift-nio:22.04-5.8 - - http: - image: swift-nio:22.04-5.8 diff --git a/docker/docker-compose.2204.59.yaml b/docker/docker-compose.2204.59.yaml deleted file mode 100644 index a1006ab0ecc..00000000000 --- a/docker/docker-compose.2204.59.yaml +++ /dev/null @@ -1,95 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-nio:22.04-5.9 - build: - args: - ubuntu_version: "jammy" - swift_version: "5.9" - - unit-tests: - image: swift-nio:22.04-5.9 - - integration-tests: - image: swift-nio:22.04-5.9 - - documentation-check: - image: swift-nio:22.04-5.9 - - test: - image: swift-nio:22.04-5.9 - environment: - - SWIFT_VERSION=5.9 - - MAX_ALLOCS_ALLOWED_10000000_asyncsequenceproducer=19 - - MAX_ALLOCS_ALLOWED_1000000_asyncwriter=1000050 - - MAX_ALLOCS_ALLOWED_1000_addHandlers=43050 - - MAX_ALLOCS_ALLOWED_1000_addHandlers_sync=36050 - - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlercontext=8050 - - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlername=8050 - - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlertype=8050 - - MAX_ALLOCS_ALLOWED_1000_autoReadGetAndSet=18050 - - MAX_ALLOCS_ALLOWED_1000_autoReadGetAndSet_sync=0 - - MAX_ALLOCS_ALLOWED_1000_copying_bytebufferview_to_array=1050 - - MAX_ALLOCS_ALLOWED_1000_copying_circularbuffer_to_array=1050 - - MAX_ALLOCS_ALLOWED_1000_getHandlers=8050 - - MAX_ALLOCS_ALLOWED_1000_getHandlers_sync=34 - - MAX_ALLOCS_ALLOWED_1000_reqs_1_conn=26400 - - MAX_ALLOCS_ALLOWED_1000_rst_connections=147050 - - MAX_ALLOCS_ALLOWED_1000_tcpbootstraps=4050 - - MAX_ALLOCS_ALLOWED_1000_tcpconnections=154050 - - MAX_ALLOCS_ALLOWED_1000_udp_reqs=6050 - - MAX_ALLOCS_ALLOWED_1000_udpbootstraps=2050 - - MAX_ALLOCS_ALLOWED_1000_udpconnections=75050 - - MAX_ALLOCS_ALLOWED_1_reqs_1000_conn=398000 - - MAX_ALLOCS_ALLOWED_bytebuffer_lots_of_rw=2050 - - MAX_ALLOCS_ALLOWED_creating_10000_headers=0 - - MAX_ALLOCS_ALLOWED_decode_1000_ws_frames=2050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer=3 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_mask=2050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_space=3 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_space_with_mask=2050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer=3050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_mask=5050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_space=3050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_space_with_mask=5050 - - MAX_ALLOCS_ALLOWED_execute_hop_10000_tasks=0 - - MAX_ALLOCS_ALLOWED_future_erase_result=4050 - - MAX_ALLOCS_ALLOWED_future_lots_of_callbacks=53050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form=700050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace=700050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace_from_long_string=700050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace_from_short_string=700050 - - MAX_ALLOCS_ALLOWED_modifying_1000_circular_buffer_elements=0 - - MAX_ALLOCS_ALLOWED_modifying_byte_buffer_view=6050 - - MAX_ALLOCS_ALLOWED_ping_pong_1000_reqs_1_conn=334 - - MAX_ALLOCS_ALLOWED_read_10000_chunks_from_file=110050 - - MAX_ALLOCS_ALLOWED_schedule_10000_tasks=40100 - - MAX_ALLOCS_ALLOWED_schedule_and_run_10000_tasks=50050 - - MAX_ALLOCS_ALLOWED_scheduling_10000_executions=89 - - MAX_ALLOCS_ALLOWED_udp_1000_reqs_1_conn=6200 - - MAX_ALLOCS_ALLOWED_udp_1_reqs_1000_conn=162050 - - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors - - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error - # - SANITIZER_ARG=--sanitize=thread # TSan broken still - - performance-test: - image: swift-nio:22.04-5.9 - - update-benchmark-baseline: - image: swift-nio:22.04-5.9 - environment: - - SWIFT_VERSION=5.9 - - shell: - image: swift-nio:22.04-5.9 - - echo: - image: swift-nio:22.04-5.9 - - http: - image: swift-nio:22.04-5.9 - - cxx-interop-build: - image: swift-nio:22.04-5.9 diff --git a/docker/docker-compose.2204.main.yaml b/docker/docker-compose.2204.main.yaml deleted file mode 100644 index 0ac14b05e83..00000000000 --- a/docker/docker-compose.2204.main.yaml +++ /dev/null @@ -1,91 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-nio:22.04-main - build: - args: - base_image: "swiftlang/swift:nightly-main-jammy" - - unit-tests: - image: swift-nio:22.04-main - - integration-tests: - image: swift-nio:22.04-main - - documentation-check: - image: swift-nio:22.04-main - - test: - image: swift-nio:22.04-main - environment: - - SWIFT_VERSION=nightly-main - - MAX_ALLOCS_ALLOWED_10000000_asyncsequenceproducer=19 - - MAX_ALLOCS_ALLOWED_1000000_asyncwriter=1000050 - - MAX_ALLOCS_ALLOWED_1000_addHandlers=43050 - - MAX_ALLOCS_ALLOWED_1000_addHandlers_sync=36050 - - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlercontext=8050 - - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlername=8050 - - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlertype=8050 - - MAX_ALLOCS_ALLOWED_1000_autoReadGetAndSet=18050 - - MAX_ALLOCS_ALLOWED_1000_autoReadGetAndSet_sync=0 - - MAX_ALLOCS_ALLOWED_1000_copying_bytebufferview_to_array=1050 - - MAX_ALLOCS_ALLOWED_1000_copying_circularbuffer_to_array=1050 - - MAX_ALLOCS_ALLOWED_1000_getHandlers=8050 - - MAX_ALLOCS_ALLOWED_1000_getHandlers_sync=34 - - MAX_ALLOCS_ALLOWED_1000_reqs_1_conn=26400 - - MAX_ALLOCS_ALLOWED_1000_rst_connections=145050 - - MAX_ALLOCS_ALLOWED_1000_tcpbootstraps=3050 - - MAX_ALLOCS_ALLOWED_1000_tcpconnections=152050 - - MAX_ALLOCS_ALLOWED_1000_udp_reqs=6050 - - MAX_ALLOCS_ALLOWED_1000_udpbootstraps=2050 - - MAX_ALLOCS_ALLOWED_1000_udpconnections=75050 - - MAX_ALLOCS_ALLOWED_1_reqs_1000_conn=389050 - - MAX_ALLOCS_ALLOWED_bytebuffer_lots_of_rw=2050 - - MAX_ALLOCS_ALLOWED_creating_10000_headers=0 - - MAX_ALLOCS_ALLOWED_decode_1000_ws_frames=2050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer=3 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_mask=2050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_space=3 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_space_with_mask=2050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer=3050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_mask=5050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_space=3050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_space_with_mask=5050 - - MAX_ALLOCS_ALLOWED_execute_hop_10000_tasks=0 - - MAX_ALLOCS_ALLOWED_future_erase_result=4050 - - MAX_ALLOCS_ALLOWED_future_lots_of_callbacks=53050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form=700050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace=700050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace_from_long_string=700050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace_from_short_string=700050 - - MAX_ALLOCS_ALLOWED_modifying_1000_circular_buffer_elements=0 - - MAX_ALLOCS_ALLOWED_modifying_byte_buffer_view=6050 - - MAX_ALLOCS_ALLOWED_ping_pong_1000_reqs_1_conn=319 - - MAX_ALLOCS_ALLOWED_read_10000_chunks_from_file=110050 - - MAX_ALLOCS_ALLOWED_schedule_10000_tasks=40100 - - MAX_ALLOCS_ALLOWED_schedule_and_run_10000_tasks=50050 - - MAX_ALLOCS_ALLOWED_scheduling_10000_executions=89 - - MAX_ALLOCS_ALLOWED_udp_1000_reqs_1_conn=6200 - - MAX_ALLOCS_ALLOWED_udp_1_reqs_1000_conn=162050 - - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors - - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error - # - SANITIZER_ARG=--sanitize=thread # TSan broken still - - performance-test: - image: swift-nio:22.04-main - - update-benchmark-baseline: - image: swift-nio:22.04-main - environment: - - SWIFT_VERSION=nightly-main - - shell: - image: swift-nio:22.04-main - - echo: - image: swift-nio:22.04-main - - http: - image: swift-nio:22.04-main diff --git a/docker/docker-compose.2204.nightly-6.0.yaml b/docker/docker-compose.2204.nightly-6.0.yaml deleted file mode 100644 index 93f4fcc2254..00000000000 --- a/docker/docker-compose.2204.nightly-6.0.yaml +++ /dev/null @@ -1,90 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-nio:22.04-next - build: - args: - base_image: "swiftlang/swift:nightly-6.0-jammy" - - unit-tests: - image: swift-nio:22.04-next - - integration-tests: - image: swift-nio:22.04-next - - documentation-check: - image: swift-nio:22.04-next - - test: - image: swift-nio:22.04-next - environment: - - SWIFT_VERSION=nightly-6.0 - - MAX_ALLOCS_ALLOWED_10000000_asyncsequenceproducer=19 - - MAX_ALLOCS_ALLOWED_1000000_asyncwriter=1000050 - - MAX_ALLOCS_ALLOWED_1000_addHandlers=43050 - - MAX_ALLOCS_ALLOWED_1000_addHandlers_sync=36050 - - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlercontext=8050 - - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlername=8050 - - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlertype=8050 - - MAX_ALLOCS_ALLOWED_1000_autoReadGetAndSet=18050 - - MAX_ALLOCS_ALLOWED_1000_autoReadGetAndSet_sync=0 - - MAX_ALLOCS_ALLOWED_1000_copying_bytebufferview_to_array=1050 - - MAX_ALLOCS_ALLOWED_1000_copying_circularbuffer_to_array=1050 - - MAX_ALLOCS_ALLOWED_1000_getHandlers=8050 - - MAX_ALLOCS_ALLOWED_1000_getHandlers_sync=34 - - MAX_ALLOCS_ALLOWED_1000_reqs_1_conn=26400 - - MAX_ALLOCS_ALLOWED_1000_rst_connections=145050 - - MAX_ALLOCS_ALLOWED_1000_tcpbootstraps=3050 - - MAX_ALLOCS_ALLOWED_1000_tcpconnections=152050 - - MAX_ALLOCS_ALLOWED_1000_udp_reqs=6050 - - MAX_ALLOCS_ALLOWED_1000_udpbootstraps=2050 - - MAX_ALLOCS_ALLOWED_1000_udpconnections=75050 - - MAX_ALLOCS_ALLOWED_1_reqs_1000_conn=389050 - - MAX_ALLOCS_ALLOWED_bytebuffer_lots_of_rw=2050 - - MAX_ALLOCS_ALLOWED_creating_10000_headers=0 - - MAX_ALLOCS_ALLOWED_decode_1000_ws_frames=2050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer=3 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_mask=2050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_space=3 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_space_with_mask=2050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer=3050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_mask=5050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_space=3050 - - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_space_with_mask=5050 - - MAX_ALLOCS_ALLOWED_execute_hop_10000_tasks=0 - - MAX_ALLOCS_ALLOWED_future_erase_result=4050 - - MAX_ALLOCS_ALLOWED_future_lots_of_callbacks=53050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form=700050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace=700050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace_from_long_string=700050 - - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace_from_short_string=700050 - - MAX_ALLOCS_ALLOWED_modifying_1000_circular_buffer_elements=0 - - MAX_ALLOCS_ALLOWED_modifying_byte_buffer_view=6050 - - MAX_ALLOCS_ALLOWED_ping_pong_1000_reqs_1_conn=319 - - MAX_ALLOCS_ALLOWED_read_10000_chunks_from_file=110050 - - MAX_ALLOCS_ALLOWED_schedule_10000_tasks=40100 - - MAX_ALLOCS_ALLOWED_schedule_and_run_10000_tasks=50050 - - MAX_ALLOCS_ALLOWED_scheduling_10000_executions=89 - - MAX_ALLOCS_ALLOWED_udp_1000_reqs_1_conn=6200 - - MAX_ALLOCS_ALLOWED_udp_1_reqs_1000_conn=162050 - - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error - # - SANITIZER_ARG=--sanitize=thread # TSan broken still - - performance-test: - image: swift-nio:22.04-next - - update-benchmark-baseline: - image: swift-nio:22.04-next - environment: - - SWIFT_VERSION=nightly-6.0 - - shell: - image: swift-nio:22.04-next - - echo: - image: swift-nio:22.04-next - - http: - image: swift-nio:22.04-next diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml deleted file mode 100644 index 1360f7ed251..00000000000 --- a/docker/docker-compose.yaml +++ /dev/null @@ -1,77 +0,0 @@ -# this file is not designed to be run directly -# instead, use the docker-compose.. files -# eg docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.1604.41.yaml run test -version: "3" - -services: - - runtime-setup: - image: swift-nio:default - build: - context: . - dockerfile: Dockerfile - - common: &common - image: swift-nio:default - depends_on: [runtime-setup] - volumes: - - ~/.ssh:/root/.ssh - - ..:/swift-nio:z - working_dir: /swift-nio - cap_drop: - - CAP_NET_RAW - - CAP_NET_BIND_SERVICE - - soundness: - <<: *common - command: /bin/bash -xcl "swift -version && uname -a && ./scripts/soundness.sh" - - unit-tests: - <<: *common - command: /bin/bash -xcl "swift $${SWIFT_TEST_VERB-test} $${WARN_AS_ERROR_ARG-} $${IMPORT_CHECK_ARG-}" - - integration-tests: - <<: *common - command: /bin/bash -xcl "./scripts/integration_tests.sh $${INTEGRATION_TESTS_ARG-}" - - documentation-check: - <<: *common - command: /bin/bash -xcl "./scripts/check-docs.sh" - - test: - <<: *common - command: /bin/bash -xcl "uname -a && swift -version && swift $${SWIFT_TEST_VERB-test} $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-} && ./scripts/integration_tests.sh $${INTEGRATION_TESTS_ARG-} && cd Benchmarks && swift package benchmark baseline check --check-absolute-path Thresholds/$${SWIFT_VERSION-}/" - - performance-test: - <<: *common - command: /bin/bash -xcl "swift build -c release -Xswiftc -Xllvm -Xswiftc -align-all-functions=5 -Xswiftc -Xllvm -Xswiftc -align-all-blocks=5 && ./.build/release/NIOPerformanceTester" - - update-benchmark-baseline: - <<: *common - command: /bin/bash -xcl "cd Benchmarks && swift package --disable-sandbox --scratch-path .build/$${SWIFT_VERSION-}/ --allow-writing-to-package-directory benchmark --format metricP90AbsoluteThresholds --path Thresholds/$${SWIFT_VERSION-}/" - - cxx-interop-build: - <<: *common - command: /bin/bash -xcl "./scripts/cxx-interop-compatibility.sh" - - # util - - shell: - <<: *common - entrypoint: /bin/bash - - # samples - - echo: - <<: *common - tty: true - ports: - - "9999:9999" - command: /bin/bash -xcl "swift run NIOEchoServer 0.0.0.0 9999" - - http: - <<: *common - tty: true - ports: - - "8888:8888" - command: /bin/bash -xcl "swift run NIOHTTP1Server 0.0.0.0 8888"