From 38d2778eb3c57882c657c9a8855c66e73f723bad Mon Sep 17 00:00:00 2001 From: jmv74211 Date: Mon, 4 Oct 2021 18:00:26 +0200 Subject: [PATCH] rm: Remove qa-ctl dockerfile qa-branch arg #1975 It was not necessary, since a new docker image was built if the qa-branch was different --- .../qa_ctl/deployment/dockerfiles/qa_ctl/Dockerfile | 4 +--- .../wazuh_testing/qa_ctl/provisioning/local_actions.py | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/deps/wazuh_testing/wazuh_testing/qa_ctl/deployment/dockerfiles/qa_ctl/Dockerfile b/deps/wazuh_testing/wazuh_testing/qa_ctl/deployment/dockerfiles/qa_ctl/Dockerfile index 39eaa483e7..7ce12933aa 100644 --- a/deps/wazuh_testing/wazuh_testing/qa_ctl/deployment/dockerfiles/qa_ctl/Dockerfile +++ b/deps/wazuh_testing/wazuh_testing/qa_ctl/deployment/dockerfiles/qa_ctl/Dockerfile @@ -1,7 +1,5 @@ From ubuntu:focal -ARG qa_branch - ENV DEBIAN_FRONTEND=noninteractive ENV RUNNING_ON_DOCKER_CONTAINER=true @@ -14,7 +12,7 @@ RUN apt-get -q update && \ python3-pip \ python3-setuptools -ADD https://raw.githubusercontent.com/wazuh/wazuh-qa/$qa_branch/requirements.txt /tmp/requirements.txt +ADD https://raw.githubusercontent.com/wazuh/wazuh-qa/master/requirements.txt /tmp/requirements.txt RUN python3 -m pip install --upgrade pip && python3 -m pip install -r /tmp/requirements.txt --ignore-installed RUN mkdir /qa_ctl diff --git a/deps/wazuh_testing/wazuh_testing/qa_ctl/provisioning/local_actions.py b/deps/wazuh_testing/wazuh_testing/qa_ctl/provisioning/local_actions.py index 93538dc7aa..5406f9ab92 100644 --- a/deps/wazuh_testing/wazuh_testing/qa_ctl/provisioning/local_actions.py +++ b/deps/wazuh_testing/wazuh_testing/qa_ctl/provisioning/local_actions.py @@ -90,7 +90,7 @@ def qa_ctl_docker_run(config_file, qa_branch, debug_level, topic): 'dockerfiles', 'qa_ctl') LOGGER.info(f"Building docker image for {topic}") - run_local_command_with_output(f"cd {docker_image_path} && docker build -q -t {docker_image_name} " - f"--build-arg qa_branch={qa_branch} .") + run_local_command_with_output(f"cd {docker_image_path} && docker build -q -t {docker_image_name} .") + LOGGER.info(f"Running the Linux container for {topic}") run_local_command(f"docker run --rm -v {gettempdir()}:/qa_ctl {docker_image_name} {docker_args}")