From 288fea89608147610473d54bad62a7bfdb7239d2 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Wed, 30 Oct 2019 17:35:19 -0400 Subject: [PATCH] Deleting unused unit-tests directory Same as https://github.com/ansible/awx/pull/5179 except I wont accidentally close it. --- tools/docker-compose/unit-tests/Dockerfile | 17 -------------- tools/docker-compose/unit-tests/README.md | 22 ------------------- .../unit-tests/docker-compose.yml | 18 --------------- tools/docker-compose/unit-tests/entrypoint.sh | 10 --------- 4 files changed, 67 deletions(-) delete mode 100644 tools/docker-compose/unit-tests/Dockerfile delete mode 100644 tools/docker-compose/unit-tests/README.md delete mode 100644 tools/docker-compose/unit-tests/docker-compose.yml delete mode 100644 tools/docker-compose/unit-tests/entrypoint.sh diff --git a/tools/docker-compose/unit-tests/Dockerfile b/tools/docker-compose/unit-tests/Dockerfile deleted file mode 100644 index caf3cd402f..0000000000 --- a/tools/docker-compose/unit-tests/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM gcr.io/ansible-tower-engineering/awx_devel:latest - -# For UI tests -RUN yum install -y pango libXcomposite libXcursor libXdamage \ - libXext libXi libXtst cups-libs libXScrnSaver libXrandr GConf2 alsa-lib atk \ - gtk3 ipa-gothic-fonts xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi \ - xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 \ - xorg-x11-fonts-misc - -RUN npm set progress=false - -WORKDIR "/awx_devel" - -ADD tools/docker-compose/unit-tests/entrypoint.sh / -RUN chmod +x /entrypoint.sh - -ENTRYPOINT ["/entrypoint.sh"] diff --git a/tools/docker-compose/unit-tests/README.md b/tools/docker-compose/unit-tests/README.md deleted file mode 100644 index 49243893fe..0000000000 --- a/tools/docker-compose/unit-tests/README.md +++ /dev/null @@ -1,22 +0,0 @@ -Run from the root of the repo: - -```shell -$ docker-compose -f tools/docker-compose/unit-tests/docker-compose.yml run unit-tests -``` - -This will start the container, install the dependencies, and run the unit tests. - -To rebuild: - - -```shell -$ docker-compose -f tools/docker-compose/unit-tests/docker-compose.yml build -``` - -If you just want to pop into a shell and poke around, run: - -```shell -$ docker-compose -f tools/docker-compose/unit-tests/docker-compose.yml run unit-tests bash -``` - -If you run into any weirdness, it's probably a good idea to just give up and `make clean`. diff --git a/tools/docker-compose/unit-tests/docker-compose.yml b/tools/docker-compose/unit-tests/docker-compose.yml deleted file mode 100644 index fa2e27e402..0000000000 --- a/tools/docker-compose/unit-tests/docker-compose.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -version: '3' -services: - unit-tests: - build: - context: ../../../ - dockerfile: tools/docker-compose/unit-tests/Dockerfile - image: gcr.io/ansible-tower-engineering/unit-test-runner:${GIT_BRANCH:-latest} - environment: - SWIG_FEATURES: "-cpperraswarn -includeall -I/usr/include/openssl" - TEST_DIRS: awx/main/tests/functional awx/main/tests/unit awx/conf/tests awx/sso/tests - RABBITMQ_HOST: rabbitmq - RABBITMQ_USER: guest - RABBITMQ_PASS: guest - RABBITMQ_VHOST: / - command: ["make test"] - volumes: - - ../../../:/awx_devel diff --git a/tools/docker-compose/unit-tests/entrypoint.sh b/tools/docker-compose/unit-tests/entrypoint.sh deleted file mode 100644 index 351434b1ff..0000000000 --- a/tools/docker-compose/unit-tests/entrypoint.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# Code duplicated from start_development.sh -cp -R /tmp/awx.egg-info /awx_devel/ || true -sed -i "s/placeholder/$(cat /awx_devel/VERSION)/" /awx_devel/awx.egg-info/PKG-INFO -cp /tmp/awx.egg-link /venv/awx/lib/python3.6/site-packages/awx.egg-link - -cp -f awx/settings/local_settings.py.docker_compose awx/settings/local_settings.py - -/bin/bash -c "$@"