From 440f3eeb6358a430af5ce3f1159f6469d424370b Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Wed, 6 Mar 2024 19:04:29 -0800 Subject: [PATCH] Remove Drone configuration/tests. --- .drone.yml | 95 ------------------- .../test_dev_parity_with_build_server.py | 38 -------- 2 files changed, 133 deletions(-) delete mode 100644 .drone.yml delete mode 100644 tests/end-to-end/test_dev_parity_with_build_server.py diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 0855e53..0000000 --- a/.drone.yml +++ /dev/null @@ -1,95 +0,0 @@ ---- -kind: pipeline -name: python-3-8-alpine-3-13 - -services: - - name: postgresql - image: docker.io/postgres:13.1-alpine - environment: - POSTGRES_PASSWORD: test - POSTGRES_DB: test - - name: postgresql2 - image: docker.io/postgres:13.1-alpine - environment: - POSTGRES_PASSWORD: test2 - POSTGRES_DB: test - commands: - - docker-entrypoint.sh -p 5433 - - name: mariadb - image: docker.io/mariadb:10.11.4 - environment: - MARIADB_ROOT_PASSWORD: test - MARIADB_DATABASE: test - - name: mariadb2 - image: docker.io/mariadb:10.11.4 - environment: - MARIADB_ROOT_PASSWORD: test2 - MARIADB_DATABASE: test - commands: - - docker-entrypoint.sh --port=3307 - - name: not-actually-mysql - image: docker.io/mariadb:10.11.4 - environment: - MARIADB_ROOT_PASSWORD: test - MARIADB_DATABASE: test - - name: not-actually-mysql2 - image: docker.io/mariadb:10.11.4 - environment: - MARIADB_ROOT_PASSWORD: test2 - MARIADB_DATABASE: test - commands: - - docker-entrypoint.sh --port=3307 - - name: mongodb - image: docker.io/mongo:5.0.5 - environment: - MONGO_INITDB_ROOT_USERNAME: root - MONGO_INITDB_ROOT_PASSWORD: test - - name: mongodb2 - image: docker.io/mongo:5.0.5 - environment: - MONGO_INITDB_ROOT_USERNAME: root2 - MONGO_INITDB_ROOT_PASSWORD: test2 - commands: - - docker-entrypoint.sh --port=27018 - -clone: - skip_verify: true - -steps: -- name: build - image: docker.io/alpine:3.13 - environment: - TEST_CONTAINER: true - pull: always - commands: - - scripts/run-full-tests ---- -kind: pipeline -name: documentation -type: exec - -platform: - os: linux - arch: amd64 - -clone: - skip_verify: true - -steps: -- name: build - environment: - USERNAME: - from_secret: docker_username - PASSWORD: - from_secret: docker_password - IMAGE_NAME: projects.torsion.org/borgmatic-collective/borgmatic:docs - commands: - - podman login --username "$USERNAME" --password "$PASSWORD" projects.torsion.org - - podman build --tag "$IMAGE_NAME" --file docs/Dockerfile --storage-opt "overlay.mount_program=/usr/bin/fuse-overlayfs" . - - podman push "$IMAGE_NAME" - -trigger: - repo: - - borgmatic-collective/borgmatic - branch: - - main diff --git a/tests/end-to-end/test_dev_parity_with_build_server.py b/tests/end-to-end/test_dev_parity_with_build_server.py deleted file mode 100644 index aa01ff0..0000000 --- a/tests/end-to-end/test_dev_parity_with_build_server.py +++ /dev/null @@ -1,38 +0,0 @@ -import ruamel.yaml - - -def test_dev_docker_compose_has_same_services_as_build_server_configuration(): - ''' - The end-to-end test configuration for local development and the build server's test - configuration use two different mechanisms for configuring and spinning up "services"—the - database containers upon which the end-to-end tests are reliant. The dev configuration uses - Docker Compose, while the Drone build server configuration uses its own similar-but-different - configuration file format. - - Therefore, to ensure dev-build parity, these tests assert that the services are the same across - the dev and build configurations. This includes service name, container image, environment - variables, and commands. - - This test only compares services and does not assert anything else about the respective testing - environments. - ''' - yaml = ruamel.yaml.YAML(typ='safe') - dev_services = { - name: service - for name, service in yaml.load(open('tests/end-to-end/docker-compose.yaml').read())[ - 'services' - ].items() - if name != 'tests' - } - build_server_services = tuple(yaml.load_all(open('.drone.yml').read()))[0]['services'] - - assert len(dev_services) == len(build_server_services) - - for build_service in build_server_services: - dev_service = dev_services[build_service['name']] - assert dev_service['image'] == build_service['image'] - assert dev_service['environment'] == build_service['environment'] - - if 'command' in dev_service or 'commands' in build_service: - assert len(build_service['commands']) <= 1 - assert dev_service['command'] == build_service['commands'][0]