From c8178d621500a275ed8c5b49bea1de7b0c1eb169 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Thu, 19 Sep 2024 14:06:05 -0700 Subject: [PATCH 1/8] stub fedora installer tests --- .gitlab-ci.yml | 46 ++++++++++++++----- conftest.py | 7 +++ utils/_context/_scenarios/auto_injection.py | 5 ++ utils/_context/virtual_machines.py | 16 ++++++- .../auto-inject_init_vm_config.yml | 20 ++++++-- .../docker/auto-inject_prepare_docker.yml | 10 +++- .../python/provision_test-app-python.yml | 10 +++- 7 files changed, 93 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4077cc6f79..4b866f3b02 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,12 +2,13 @@ include: - remote: https://gitlab-templates.ddbuild.io/libdatadog/include/single-step-instrumentation-tests.yml stages: - - ruby_tracer - - nodejs_tracer - - java_tracer - - python_tracer - - dotnet_tracer - - php_tracer + - fedora_tracer + # - ruby_tracer + # - nodejs_tracer + # - java_tracer + # - python_tracer + # - dotnet_tracer + # - php_tracer - parse_results - before_tests @@ -32,7 +33,28 @@ variables: KUBERNETES_CPU_REQUEST: "6" KUBERNETES_CPU_LIMIT: "6" -onboarding_nodejs: +onboarding_fedora_host: + extends: .base_job_onboarding_system_tests + stage: fedora_tracer + allow_failure: true + dependencies: [] + rules: + - if: $CI_PIPELINE_SOURCE == "schedule" + when: always + - when: manual + variables: + SCENARIO: "SIMPLE_INSTALLER_AUTO_INJECTION" + AMI_UPDATE: "true" + parallel: + matrix: + - ONBOARDING_FILTER_ENV: [dev, prod] + TEST_LIBRARY: [nodejs, python, java, ruby, dotnet, php] + + script: + - ./build.sh -i runner + - timeout 2700s ./run.sh $SCENARIO --vm-weblog test-app-${TEST_LIBRARY} --vm-env ${ONBOARDING_FILTER_ENV} --vm-library ${TEST_LIBRARY} --vm-provider aws --vm-default-vms False + +.onboarding_nodejs: extends: .base_job_onboarding_system_tests stage: nodejs_tracer allow_failure: true @@ -70,7 +92,7 @@ onboarding_nodejs: - ./build.sh -i runner - timeout 2700s ./run.sh $SCENARIO --vm-weblog ${ONBOARDING_FILTER_WEBLOG} --vm-env ${ONBOARDING_FILTER_ENV} --vm-library ${TEST_LIBRARY} --vm-provider aws -onboarding_java: +.onboarding_java: extends: .base_job_onboarding_system_tests stage: java_tracer allow_failure: true @@ -114,7 +136,7 @@ onboarding_java: - ./build.sh -i runner - timeout 2700s ./run.sh $SCENARIO --vm-weblog ${ONBOARDING_FILTER_WEBLOG} --vm-env ${ONBOARDING_FILTER_ENV} --vm-library ${TEST_LIBRARY} --vm-provider aws -onboarding_python: +.onboarding_python: extends: .base_job_onboarding_system_tests stage: python_tracer allow_failure: true @@ -152,7 +174,7 @@ onboarding_python: - ./build.sh -i runner - timeout 2700s ./run.sh $SCENARIO --vm-weblog ${ONBOARDING_FILTER_WEBLOG} --vm-env ${ONBOARDING_FILTER_ENV} --vm-library ${TEST_LIBRARY} --vm-provider aws -onboarding_dotnet: +.onboarding_dotnet: extends: .base_job_onboarding_system_tests stage: dotnet_tracer allow_failure: true @@ -187,7 +209,7 @@ onboarding_dotnet: - ./build.sh -i runner - timeout 2700s ./run.sh $SCENARIO --vm-weblog ${ONBOARDING_FILTER_WEBLOG} --vm-env ${ONBOARDING_FILTER_ENV} --vm-library ${TEST_LIBRARY} --vm-provider aws -onboarding_ruby: +.onboarding_ruby: extends: .base_job_onboarding_system_tests stage: ruby_tracer allow_failure: true @@ -222,7 +244,7 @@ onboarding_ruby: - ./build.sh -i runner - timeout 2700s ./run.sh $SCENARIO --vm-weblog ${ONBOARDING_FILTER_WEBLOG} --vm-env ${ONBOARDING_FILTER_ENV} --vm-library ${TEST_LIBRARY} --vm-provider aws -onboarding_php: +.onboarding_php: extends: .base_job_onboarding_system_tests stage: php_tracer allow_failure: true diff --git a/conftest.py b/conftest.py index c3a13ab3c9..50d08e58ea 100644 --- a/conftest.py +++ b/conftest.py @@ -44,6 +44,13 @@ def pytest_addoption(parser): parser.addoption("--vm-provider", type=str, action="store", help="Set provider for VMs") parser.addoption("--vm-only-branch", type=str, action="store", help="Filter to execute only one vm branch") parser.addoption("--vm-skip-branches", type=str, action="store", help="Filter exclude vm branches") + parser.addoption( + "--vm-default-vms", + type=str, + action="store", + help="True launch vms marked as default, False launch only no default vm. All launch all vms", + default="True", + ) # Docker ssi scenarios parser.addoption("--ssi-weblog", type=str, action="store", help="Set docker ssi weblog") diff --git a/utils/_context/_scenarios/auto_injection.py b/utils/_context/_scenarios/auto_injection.py index 11cc47b15b..42e1cf4398 100644 --- a/utils/_context/_scenarios/auto_injection.py +++ b/utils/_context/_scenarios/auto_injection.py @@ -13,6 +13,7 @@ AmazonLinux2DotNet6, AmazonLinux2amd64, Centos7amd64, + Fedora39amd64, ) from .core import Scenario @@ -35,6 +36,7 @@ def __init__( include_amazon_linux_2023_amd64=False, include_amazon_linux_2023_arm64=False, include_centos_7_amd64=False, + include_fedora_39_amd64=False, agent_env=None, app_env=None, scenario_groups=None, @@ -67,6 +69,8 @@ def __init__( self.required_vms.append(AmazonLinux2023arm64()) if include_centos_7_amd64: self.required_vms.append(Centos7amd64()) + if include_fedora_39_amd64: + self.required_vms.append(Fedora39amd64()) def print_installed_components(self): logger.terminal.write_sep("=", "Installed components", bold=True) @@ -189,5 +193,6 @@ def __init__( include_amazon_linux_2023_amd64=True, include_amazon_linux_2023_arm64=True, include_centos_7_amd64=True, + include_fedora_39_amd64=True, scenario_groups=scenario_groups, ) diff --git a/utils/_context/virtual_machines.py b/utils/_context/virtual_machines.py index d563b78765..b50839d746 100644 --- a/utils/_context/virtual_machines.py +++ b/utils/_context/virtual_machines.py @@ -3,7 +3,6 @@ import hashlib from utils.tools import logger -from utils._context.library_version import Version from utils import context from utils.onboarding.debug_vm import extract_logs_to_file @@ -331,3 +330,18 @@ def __init__(self, **kwargs) -> None: os_cpu="amd64", **kwargs, ) + + +class Fedora39amd64(_VirtualMachine): + def __init__(sef, **kwargs) -> None: + super().__init__( + "Fedora_39_amd64", + aws_config=_AWSConfig(ami_id="ami-0ba8f2988373d0735", ami_instance_type="t2.medium", user="fedora"), + vagrant_config=None, + krunvm_config=None, + os_type="linux", + os_distro="rpm", + os_branch="fedora", + os_cpu="amd64", + **kwargs, + ) diff --git a/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml b/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml index 44989cc8e9..ae55655d72 100644 --- a/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml +++ b/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml @@ -1,12 +1,12 @@ - #Add initial configuration that it must do after start the machine + #Add initial configuration that it must do after start the machine - os_type: linux os_distro: deb remote-command: | - #Disable auto updates. It could raise problems if the update proccess is launched just when we are trying to install de software + #Disable auto updates. It could raise problems if the update proccess is launched just when we are trying to install de software sudo sed -i 's/1/0/g' /etc/apt/apt.conf.d/20auto-upgrades sudo sed -i 's/1/0/g' /etc/apt/apt.conf.d/10periodic || true - + echo "On VM boot the Apt service status::::" sudo ps -fea|grep apt echo "On VM boot the System service apt-daily.service status" @@ -49,11 +49,11 @@ - os_type: linux os_distro: rpm os_branch: centos_7_amd64 # CentOS override as the mirrors are not available anymore - remote-command: | + remote-command: | sudo sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo sudo sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo sudo sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo - + #Allow DD env variables from ssh echo 'AcceptEnv DD_*' | sudo tee -a /etc/ssh/sshd_config sudo id -u datadog &>/dev/null || sudo useradd -m datadog @@ -61,6 +61,16 @@ #sudo yum -y update sudo systemctl restart sshd.service +- os_type: linux + os_distro: rpm + os_branch: fedora + remote-command: | + echo 'AcceptEnv DD_*' | sudo tee -a /etc/ssh/sshd_config + sudo id -u datadog &>/dev/null || sudo useradd -m datadog + sudo yum clean expire-cache + #sudo yum -y update + sudo systemctl restart sshd.service + - os_type: linux os_distro: rpm remote-command: | diff --git a/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml b/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml index 6775f3add8..382fb5ba5b 100644 --- a/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml +++ b/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml @@ -26,10 +26,18 @@ curl -fsSL https://get.docker.com | sudo sh sudo systemctl start docker sudo curl -L https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m) -o /usr/bin/docker-compose && sudo chmod +x /usr/bin/docker-compose && sudo docker-compose --version + - os_type: linux + os_distro: rpm + os_branch: fedora + remote-command: | + sudo dnf -y install dnf-plugins-core + sudo dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo + sudo dnf install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin + sudo systemctl start docker - os_type: linux os_distro: rpm remote-command: | sudo yum -y install docker sudo systemctl start docker.service sudo curl -L https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m) -o /usr/bin/docker-compose && sudo chmod +x /usr/bin/docker-compose && sudo docker-compose --version - \ No newline at end of file + diff --git a/utils/build/virtual_machine/weblogs/python/provision_test-app-python.yml b/utils/build/virtual_machine/weblogs/python/provision_test-app-python.yml index 49a908aeae..6521b8ba6b 100644 --- a/utils/build/virtual_machine/weblogs/python/provision_test-app-python.yml +++ b/utils/build/virtual_machine/weblogs/python/provision_test-app-python.yml @@ -2,7 +2,7 @@ lang_variant: name: Python_3.8.15 version: 3.8.15 cache: true - install: + install: - os_type: linux os_distro: deb copy_files: @@ -15,7 +15,13 @@ lang_variant: copy_files: - name: copy-auto-install-script local_path: utils/build/virtual_machine/weblogs/python/test-app-python/python_install.sh - remote-command: sudo sh python_install.sh rpm 3.8.15 + remote-command: | + if ! command -v make &> /dev/null + then + sudo yum groupinstall "Development Tools" -y + fi + sudo sh python_install.sh rpm 3.8.15 + weblog: name: test-app-python From 572452bc8f402c62dcdb4d178202d6396884b9bf Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Fri, 20 Sep 2024 11:10:47 -0700 Subject: [PATCH 2/8] simplify --- .../auto-inject/auto-inject_init_vm_config.yml | 10 ---------- .../auto-inject/docker/auto-inject_prepare_docker.yml | 3 +-- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml b/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml index ae55655d72..83bb5d2bd9 100644 --- a/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml +++ b/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml @@ -61,16 +61,6 @@ #sudo yum -y update sudo systemctl restart sshd.service -- os_type: linux - os_distro: rpm - os_branch: fedora - remote-command: | - echo 'AcceptEnv DD_*' | sudo tee -a /etc/ssh/sshd_config - sudo id -u datadog &>/dev/null || sudo useradd -m datadog - sudo yum clean expire-cache - #sudo yum -y update - sudo systemctl restart sshd.service - - os_type: linux os_distro: rpm remote-command: | diff --git a/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml b/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml index 382fb5ba5b..65f2942bb5 100644 --- a/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml +++ b/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml @@ -30,9 +30,8 @@ os_distro: rpm os_branch: fedora remote-command: | - sudo dnf -y install dnf-plugins-core sudo dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo - sudo dnf install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin + sudo dnf install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin sudo systemctl start docker - os_type: linux os_distro: rpm From c7ad1f2edb2534fa4be0956284a6f636f9862667 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Fri, 20 Sep 2024 13:09:25 -0700 Subject: [PATCH 3/8] reset to working state --- .gitlab-ci.yml | 2 +- conftest.py | 7 ------- utils/_context/virtual_machines.py | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b866f3b02..3cade20779 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ onboarding_fedora_host: script: - ./build.sh -i runner - - timeout 2700s ./run.sh $SCENARIO --vm-weblog test-app-${TEST_LIBRARY} --vm-env ${ONBOARDING_FILTER_ENV} --vm-library ${TEST_LIBRARY} --vm-provider aws --vm-default-vms False + - timeout 2700s ./run.sh $SCENARIO --vm-weblog test-app-${TEST_LIBRARY} --vm-env ${ONBOARDING_FILTER_ENV} --vm-library ${TEST_LIBRARY} --vm-provider aws .onboarding_nodejs: extends: .base_job_onboarding_system_tests diff --git a/conftest.py b/conftest.py index 50d08e58ea..c3a13ab3c9 100644 --- a/conftest.py +++ b/conftest.py @@ -44,13 +44,6 @@ def pytest_addoption(parser): parser.addoption("--vm-provider", type=str, action="store", help="Set provider for VMs") parser.addoption("--vm-only-branch", type=str, action="store", help="Filter to execute only one vm branch") parser.addoption("--vm-skip-branches", type=str, action="store", help="Filter exclude vm branches") - parser.addoption( - "--vm-default-vms", - type=str, - action="store", - help="True launch vms marked as default, False launch only no default vm. All launch all vms", - default="True", - ) # Docker ssi scenarios parser.addoption("--ssi-weblog", type=str, action="store", help="Set docker ssi weblog") diff --git a/utils/_context/virtual_machines.py b/utils/_context/virtual_machines.py index b50839d746..7807eee0e5 100644 --- a/utils/_context/virtual_machines.py +++ b/utils/_context/virtual_machines.py @@ -336,7 +336,7 @@ class Fedora39amd64(_VirtualMachine): def __init__(sef, **kwargs) -> None: super().__init__( "Fedora_39_amd64", - aws_config=_AWSConfig(ami_id="ami-0ba8f2988373d0735", ami_instance_type="t2.medium", user="fedora"), + aws_config=_AWSConfig(ami_id="ami-0ee7ca65ea2e8c5d9", ami_instance_type="t2.medium", user="fedora"), vagrant_config=None, krunvm_config=None, os_type="linux", From 8f0c820ad2dc7afef3dd68586b99abae96583f45 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Mon, 23 Sep 2024 10:16:54 -0700 Subject: [PATCH 4/8] use a Cloud-Base AMI --- utils/_context/virtual_machines.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/_context/virtual_machines.py b/utils/_context/virtual_machines.py index 1c3e869862..33d67d61a9 100644 --- a/utils/_context/virtual_machines.py +++ b/utils/_context/virtual_machines.py @@ -347,7 +347,7 @@ class Fedora39amd64(_VirtualMachine): def __init__(sef, **kwargs) -> None: super().__init__( "Fedora_39_amd64", - aws_config=_AWSConfig(ami_id="ami-0ee7ca65ea2e8c5d9", ami_instance_type="t2.medium", user="fedora"), + aws_config=_AWSConfig(ami_id="ami-000b124ff0d6fd0a1", ami_instance_type="t2.medium", user="fedora"), vagrant_config=None, krunvm_config=None, os_type="linux", From dbe1257d60adf4c527e977d6d5a9b20b8a463828 Mon Sep 17 00:00:00 2001 From: Emmett Butler <723615+emmettbutler@users.noreply.github.com> Date: Mon, 23 Sep 2024 13:33:19 -0700 Subject: [PATCH 5/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1879bfe7c8..54acd6dfbe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,7 +106,7 @@ onboarding_nodejs: - ./build.sh -i runner - timeout 2700s ./run.sh $SCENARIO --vm-weblog ${ONBOARDING_FILTER_WEBLOG} --vm-env ${ONBOARDING_FILTER_ENV} --vm-library ${TEST_LIBRARY} --vm-provider aws -.onboarding_java: +onboarding_java: extends: .base_job_onboarding_system_tests stage: java_tracer allow_failure: true @@ -150,7 +150,7 @@ onboarding_nodejs: - ./build.sh -i runner - timeout 2700s ./run.sh $SCENARIO --vm-weblog ${ONBOARDING_FILTER_WEBLOG} --vm-env ${ONBOARDING_FILTER_ENV} --vm-library ${TEST_LIBRARY} --vm-provider aws -.onboarding_python: +onboarding_python: extends: .base_job_onboarding_system_tests stage: python_tracer allow_failure: true @@ -188,7 +188,7 @@ onboarding_nodejs: - ./build.sh -i runner - timeout 2700s ./run.sh $SCENARIO --vm-weblog ${ONBOARDING_FILTER_WEBLOG} --vm-env ${ONBOARDING_FILTER_ENV} --vm-library ${TEST_LIBRARY} --vm-provider aws -.onboarding_dotnet: +onboarding_dotnet: extends: .base_job_onboarding_system_tests stage: dotnet_tracer allow_failure: true @@ -223,7 +223,7 @@ onboarding_nodejs: - ./build.sh -i runner - timeout 2700s ./run.sh $SCENARIO --vm-weblog ${ONBOARDING_FILTER_WEBLOG} --vm-env ${ONBOARDING_FILTER_ENV} --vm-library ${TEST_LIBRARY} --vm-provider aws -.onboarding_ruby: +onboarding_ruby: extends: .base_job_onboarding_system_tests stage: ruby_tracer allow_failure: true @@ -258,7 +258,7 @@ onboarding_nodejs: - ./build.sh -i runner - timeout 2700s ./run.sh $SCENARIO --vm-weblog ${ONBOARDING_FILTER_WEBLOG} --vm-env ${ONBOARDING_FILTER_ENV} --vm-library ${TEST_LIBRARY} --vm-provider aws -.onboarding_php: +onboarding_php: extends: .base_job_onboarding_system_tests stage: php_tracer allow_failure: true From bdc041888aee2419de45eee8c4b75ab061f82d19 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Mon, 23 Sep 2024 13:35:35 -0700 Subject: [PATCH 6/8] undo; --- .../auto-inject/auto-inject_init_vm_config.yml | 10 +++++----- .../weblogs/python/provision_test-app-python.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml b/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml index 0b2f4dafaf..782809904e 100644 --- a/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml +++ b/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml @@ -1,12 +1,12 @@ - #Add initial configuration that it must do after start the machine + #Add initial configuration that it must do after start the machine - os_type: linux os_distro: deb remote-command: | - #Disable auto updates. It could raise problems if the update proccess is launched just when we are trying to install de software + #Disable auto updates. It could raise problems if the update proccess is launched just when we are trying to install de software sudo sed -i 's/1/0/g' /etc/apt/apt.conf.d/20auto-upgrades sudo sed -i 's/1/0/g' /etc/apt/apt.conf.d/10periodic || true - + echo "On VM boot the Apt service status::::" sudo ps -fea|grep apt echo "On VM boot the System service apt-daily.service status" @@ -49,11 +49,11 @@ - os_type: linux os_distro: rpm os_branch: centos_7_amd64 # CentOS override as the mirrors are not available anymore - remote-command: | + remote-command: | sudo sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo sudo sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo sudo sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo - + #Allow DD env variables from ssh echo 'AcceptEnv DD_*' | sudo tee -a /etc/ssh/sshd_config sudo id -u datadog &>/dev/null || sudo useradd -m datadog diff --git a/utils/build/virtual_machine/weblogs/python/provision_test-app-python.yml b/utils/build/virtual_machine/weblogs/python/provision_test-app-python.yml index 55471a6494..89f4e1df61 100644 --- a/utils/build/virtual_machine/weblogs/python/provision_test-app-python.yml +++ b/utils/build/virtual_machine/weblogs/python/provision_test-app-python.yml @@ -2,7 +2,7 @@ lang_variant: name: Python_3.8.15 version: 3.8.15 cache: true - install: + install: - os_type: linux os_distro: deb copy_files: From 326c9382425add539203d9c09e433401a5474dcb Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Tue, 24 Sep 2024 07:25:46 -0700 Subject: [PATCH 7/8] docker-compose --- .../provisions/auto-inject/docker/auto-inject_prepare_docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml b/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml index 2711eec8b9..32cc5b3c5b 100644 --- a/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml +++ b/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml @@ -37,6 +37,7 @@ sudo dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo sudo dnf install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin sudo systemctl start docker + sudo curl -L https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m) -o /usr/bin/docker-compose && sudo chmod +x /usr/bin/docker-compose && sudo docker-compose --version - os_type: linux os_distro: rpm From 18620d9ed4b7e6db4b3f6d6f8602d5ac82624acc Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Tue, 24 Sep 2024 09:33:30 -0700 Subject: [PATCH 8/8] try cleaning up the docker installation based on local tests against public.ecr.aws/docker/library/fedora:rawhide --- .../auto-inject/docker/auto-inject_prepare_docker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml b/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml index 32cc5b3c5b..2ca8cb6648 100644 --- a/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml +++ b/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml @@ -34,8 +34,7 @@ os_distro: rpm os_branch: fedora remote-command: | - sudo dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo - sudo dnf install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin + sudo dnf install -y docker sudo systemctl start docker sudo curl -L https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m) -o /usr/bin/docker-compose && sudo chmod +x /usr/bin/docker-compose && sudo docker-compose --version