From e9728c9b85ac0ef40c7a0ea8b5938f5fd63b1397 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Thu, 3 Oct 2024 09:09:57 -0700 Subject: [PATCH 1/7] add older debian tests --- utils/_context/_scenarios/auto_injection.py | 25 +++++++ utils/_context/virtual_machines.py | 80 +++++++++++++++++++++ 2 files changed, 105 insertions(+) diff --git a/utils/_context/_scenarios/auto_injection.py b/utils/_context/_scenarios/auto_injection.py index f80cf516e4..be261d0936 100644 --- a/utils/_context/_scenarios/auto_injection.py +++ b/utils/_context/_scenarios/auto_injection.py @@ -30,6 +30,11 @@ OracleLinux79amd64, Debian12amd64, Debian12arm64, + Debian11amd64, + Debian11arm64, + Debian10amd64, + Debian10arm64, + Debian9amd64, AlmaLinux8amd64, AlmaLinux8arm64, AlmaLinux9amd64, @@ -73,6 +78,11 @@ def __init__( include_oraclelinux_7_9_amd64=False, include_debian_12_amd64=False, include_debian_12_arm64=False, + include_debian_11_amd64=False, + include_debian_11_arm64=False, + include_debian_10_amd64=False, + include_debian_10_arm64=False, + include_debian_9_amd64=False, include_almalinux_8_amd64=False, include_almalinux_8_arm64=False, include_almalinux_9_amd64=False, @@ -144,6 +154,16 @@ def __init__( self.required_vms.append(Debian12amd64()) if include_debian_12_arm64: self.required_vms.append(Debian12arm64()) + if include_debian_11_amd64: + self.required_vms.append(Debian11amd64()) + if include_debian_11_arm64: + self.required_vms.append(Debian11arm64()) + if include_debian_10_amd64: + self.required_vms.append(Debian10amd64()) + if include_debian_10_arm64: + self.required_vms.append(Debian10arm64()) + if include_debian_9_amd64: + self.required_vms.append(Debian9amd64()) if include_almalinux_8_amd64: self.required_vms.append(AlmaLinux8amd64()) if include_almalinux_8_arm64: @@ -322,6 +342,11 @@ def __init__( include_oraclelinux_7_9_amd64=True, include_debian_12_amd64=True, include_debian_12_arm64=True, + include_debian_11_amd64=True, + include_debian_11_arm64=True, + include_debian_10_amd64=True, + include_debian_10_arm64=True, + include_debian_9_amd64=True, include_almalinux_8_amd64=True, include_almalinux_8_arm64=True, include_almalinux_9_amd64=True, diff --git a/utils/_context/virtual_machines.py b/utils/_context/virtual_machines.py index deac7c439a..670ef6c34e 100644 --- a/utils/_context/virtual_machines.py +++ b/utils/_context/virtual_machines.py @@ -475,6 +475,86 @@ def __init__(self, **kwargs) -> None: ) +class Debian11amd64(_VirtualMachine): + def __init__(self, **kwargs) -> None: + super().__init__( + "Debian_11_amd64", + aws_config=_AWSConfig(ami_id="ami-0607e701db389efe7", ami_instance_type="t2.medium", user="admin"), + vagrant_config=None, + krunvm_config=None, + os_type="linux", + os_distro="deb", + os_branch="debian", + os_cpu="amd64", + default_vm=False, + **kwargs, + ) + + +class Debian11arm64(_VirtualMachine): + def __init__(self, **kwargs) -> None: + super().__init__( + "Debian_11_arm64", + aws_config=_AWSConfig(ami_id="ami-00988b9ead6afb0b1", ami_instance_type="t4g.small", user="admin"), + vagrant_config=None, + krunvm_config=None, + os_type="linux", + os_distro="deb", + os_branch="debian", + os_cpu="arm64", + default_vm=False, + **kwargs, + ) + + +class Debian10amd64(_VirtualMachine): + def __init__(self, **kwargs) -> None: + super().__init__( + "Debian_10_amd64", + aws_config=_AWSConfig(ami_id="ami-03898633fee508324", ami_instance_type="t2.medium", user="admin"), + vagrant_config=None, + krunvm_config=None, + os_type="linux", + os_distro="deb", + os_branch="debian", + os_cpu="amd64", + default_vm=False, + **kwargs, + ) + + +class Debian10arm64(_VirtualMachine): + def __init__(self, **kwargs) -> None: + super().__init__( + "Debian_10_arm64", + aws_config=_AWSConfig(ami_id="ami-0697abf6261fa4214", ami_instance_type="t4g.small", user="admin"), + vagrant_config=None, + krunvm_config=None, + os_type="linux", + os_distro="deb", + os_branch="debian", + os_cpu="arm64", + default_vm=False, + **kwargs, + ) + + +class Debian9amd64(_VirtualMachine): + def __init__(self, **kwargs) -> None: + super().__init__( + "Debian_9_amd64", + aws_config=_AWSConfig(ami_id="ami-099d228beefd189f5", ami_instance_type="t2.medium", user="admin"), + vagrant_config=None, + krunvm_config=None, + os_type="linux", + os_distro="deb", + os_branch="debian", + os_cpu="amd64", + default_vm=False, + **kwargs, + ) + + # 8.10.20240820 # https://wiki.almalinux.org/cloud/AWS.html#community-amis class AlmaLinux8amd64(_VirtualMachine): From 4ebb3e83c06620f1e2090a58bdb2fcd7cc5858d9 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Thu, 3 Oct 2024 10:55:47 -0700 Subject: [PATCH 2/7] different 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 670ef6c34e..7b90c33fcc 100644 --- a/utils/_context/virtual_machines.py +++ b/utils/_context/virtual_machines.py @@ -527,7 +527,7 @@ class Debian10arm64(_VirtualMachine): def __init__(self, **kwargs) -> None: super().__init__( "Debian_10_arm64", - aws_config=_AWSConfig(ami_id="ami-0697abf6261fa4214", ami_instance_type="t4g.small", user="admin"), + aws_config=_AWSConfig(ami_id="ami-01055bb8b97dfc981", ami_instance_type="t4g.small", user="admin"), vagrant_config=None, krunvm_config=None, os_type="linux", From ccfc3e53563739506a5df699df64a9e03b64a27b Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Thu, 3 Oct 2024 13:29:36 -0700 Subject: [PATCH 3/7] no 9 for now --- utils/_context/_scenarios/auto_injection.py | 5 ----- utils/_context/virtual_machines.py | 16 ---------------- 2 files changed, 21 deletions(-) diff --git a/utils/_context/_scenarios/auto_injection.py b/utils/_context/_scenarios/auto_injection.py index be261d0936..fe115a4af6 100644 --- a/utils/_context/_scenarios/auto_injection.py +++ b/utils/_context/_scenarios/auto_injection.py @@ -34,7 +34,6 @@ Debian11arm64, Debian10amd64, Debian10arm64, - Debian9amd64, AlmaLinux8amd64, AlmaLinux8arm64, AlmaLinux9amd64, @@ -82,7 +81,6 @@ def __init__( include_debian_11_arm64=False, include_debian_10_amd64=False, include_debian_10_arm64=False, - include_debian_9_amd64=False, include_almalinux_8_amd64=False, include_almalinux_8_arm64=False, include_almalinux_9_amd64=False, @@ -162,8 +160,6 @@ def __init__( self.required_vms.append(Debian10amd64()) if include_debian_10_arm64: self.required_vms.append(Debian10arm64()) - if include_debian_9_amd64: - self.required_vms.append(Debian9amd64()) if include_almalinux_8_amd64: self.required_vms.append(AlmaLinux8amd64()) if include_almalinux_8_arm64: @@ -346,7 +342,6 @@ def __init__( include_debian_11_arm64=True, include_debian_10_amd64=True, include_debian_10_arm64=True, - include_debian_9_amd64=True, include_almalinux_8_amd64=True, include_almalinux_8_arm64=True, include_almalinux_9_amd64=True, diff --git a/utils/_context/virtual_machines.py b/utils/_context/virtual_machines.py index 7b90c33fcc..ab555e6ee9 100644 --- a/utils/_context/virtual_machines.py +++ b/utils/_context/virtual_machines.py @@ -539,22 +539,6 @@ def __init__(self, **kwargs) -> None: ) -class Debian9amd64(_VirtualMachine): - def __init__(self, **kwargs) -> None: - super().__init__( - "Debian_9_amd64", - aws_config=_AWSConfig(ami_id="ami-099d228beefd189f5", ami_instance_type="t2.medium", user="admin"), - vagrant_config=None, - krunvm_config=None, - os_type="linux", - os_distro="deb", - os_branch="debian", - os_cpu="amd64", - default_vm=False, - **kwargs, - ) - - # 8.10.20240820 # https://wiki.almalinux.org/cloud/AWS.html#community-amis class AlmaLinux8amd64(_VirtualMachine): From 276202d4155e3bb96f977779576e19b0b4538edc Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Fri, 4 Oct 2024 06:49:22 -0700 Subject: [PATCH 4/7] debug print and remove a variable --- .../auto-inject/docker/auto-inject_prepare_docker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 2bd2cf4f9c..c66fdd159e 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 @@ -14,7 +14,9 @@ sudo apt-get update sudo apt-get -y install docker-ce docker-ce-cli containerd.io docker-compose-plugin sudo apt-get -y install docker-buildx-plugin || true #Ubuntu 21.04 doesn't have this package - 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 + echo `uname -s` + echo `uname -m` + sudo curl -L https://github.com/docker/compose/releases/latest/download/docker-compose-linux-$(uname -m) -o /usr/bin/docker-compose && sudo chmod +x /usr/bin/docker-compose && sudo docker-compose --version echo "DOCKER INSTALLED!" #To run Docker without root privileges #sudo groupadd docker From dd30eb1ab585dd98ba863c98169c3d2673113a51 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Fri, 4 Oct 2024 08:13:19 -0700 Subject: [PATCH 5/7] dont try to use nonexistent backports source --- .../auto-inject_init_vm_config.yml | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 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 33635f756c..422436f193 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" @@ -29,13 +29,17 @@ if [ -e "$lsb_release" ]; then if grep -q 'Ubuntu 21.04' "$lsb_release"; then echo "Configuring ubuntu 21.04 repositories" - sudo sed -i -r 's/ports.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list + sudo sed -i -r 's/ports.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list sudo sed -i -r 's/ubuntu-ports/ubuntu/g' /etc/apt/sources.list sudo sed -i -r 's/us-east-1.ec2.//g' /etc/apt/sources.list + fi + if grep -q 'Debian 10' "$lsb_release"; then + echo "Configuring debian 10 repositories" + sudo sed -i -r 's/cdn-aws.deb.debian.org/archive.debian.org/g' /etc/apt/sources.list + fi echo 'apt_preserve_sources_list: true' | sudo tee -a /etc/cloud/cloud.cfg sudo apt-get update - fi - fi + fi sudo apt-get -y update #Install some basic tools (microvm doesn't have them by default) @@ -65,11 +69,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 From f3e4a1c7c02e4b47f815a69fb4869647a3759025 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Fri, 4 Oct 2024 08:43:15 -0700 Subject: [PATCH 6/7] remove sources list adjustment from conditional that does not apply to debian --- .../provisions/auto-inject/auto-inject_init_vm_config.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 422436f193..832b539c1f 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 @@ -33,10 +33,12 @@ sudo sed -i -r 's/ubuntu-ports/ubuntu/g' /etc/apt/sources.list sudo sed -i -r 's/us-east-1.ec2.//g' /etc/apt/sources.list fi - if grep -q 'Debian 10' "$lsb_release"; then + echo 'apt_preserve_sources_list: true' | sudo tee -a /etc/cloud/cloud.cfg + sudo apt-get update + fi + if [ "$(. /etc/os-release && echo "$VERSION_CODENAME")" = "buster" ]; then echo "Configuring debian 10 repositories" sudo sed -i -r 's/cdn-aws.deb.debian.org/archive.debian.org/g' /etc/apt/sources.list - fi echo 'apt_preserve_sources_list: true' | sudo tee -a /etc/cloud/cloud.cfg sudo apt-get update fi From 79aa426dffea77be08c5a17cb6a9a70dd44ee488 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Fri, 4 Oct 2024 09:54:34 -0700 Subject: [PATCH 7/7] do not attempt to use unstable source for buster --- .../docker/auto-inject_prepare_docker.yml | 2 -- .../java/provision_test-app-java-alpine-jdk15.yml | 6 +++++- .../java/provision_test-app-java-alpine-jdk21.yml | 6 +++++- .../java/provision_test-app-java-alpine-libgcc.yml | 6 +++++- .../weblogs/java/provision_test-app-java-alpine.yml | 6 +++++- .../java/provision_test-app-java-container-jdk15.yml | 8 ++++++-- .../java/provision_test-app-java-container.yml | 6 +++++- .../weblogs/java/provision_test-app-java.yml | 12 ++++++++---- 8 files changed, 39 insertions(+), 13 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 c66fdd159e..ad60224d4e 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 @@ -14,8 +14,6 @@ sudo apt-get update sudo apt-get -y install docker-ce docker-ce-cli containerd.io docker-compose-plugin sudo apt-get -y install docker-buildx-plugin || true #Ubuntu 21.04 doesn't have this package - echo `uname -s` - echo `uname -m` sudo curl -L https://github.com/docker/compose/releases/latest/download/docker-compose-linux-$(uname -m) -o /usr/bin/docker-compose && sudo chmod +x /usr/bin/docker-compose && sudo docker-compose --version echo "DOCKER INSTALLED!" #To run Docker without root privileges diff --git a/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine-jdk15.yml b/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine-jdk15.yml index f054ae9ffa..65e4daa3dc 100644 --- a/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine-jdk15.yml +++ b/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine-jdk15.yml @@ -7,7 +7,11 @@ lang_variant: os_distro: deb os_branch: debian remote-command: | - echo 'deb http://deb.debian.org/debian unstable main non-free contrib' | sudo tee -a /etc/apt/sources.list + if [ "$(. /etc/os-release && echo "$VERSION_CODENAME")" = "buster" ]; then + echo 'deb http://archive.debian.org/debian buster main non-free contrib' | sudo tee -a /etc/apt/sources.list + else + echo 'deb http://deb.debian.org/debian unstable main non-free contrib' | sudo tee -a /etc/apt/sources.list + fi sudo apt update sudo apt -y install openjdk-11-jdk diff --git a/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine-jdk21.yml b/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine-jdk21.yml index 7adfe622e4..24e274ab90 100644 --- a/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine-jdk21.yml +++ b/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine-jdk21.yml @@ -7,7 +7,11 @@ lang_variant: os_distro: deb os_branch: debian remote-command: | - echo 'deb http://deb.debian.org/debian unstable main non-free contrib' | sudo tee -a /etc/apt/sources.list + if [ "$(. /etc/os-release && echo "$VERSION_CODENAME")" = "buster" ]; then + echo 'deb http://archive.debian.org/debian buster main non-free contrib' | sudo tee -a /etc/apt/sources.list + else + echo 'deb http://deb.debian.org/debian unstable main non-free contrib' | sudo tee -a /etc/apt/sources.list + fi sudo apt update sudo apt -y install openjdk-11-jdk diff --git a/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine-libgcc.yml b/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine-libgcc.yml index 6e1c7a98cb..8050ea0db4 100644 --- a/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine-libgcc.yml +++ b/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine-libgcc.yml @@ -6,7 +6,11 @@ lang_variant: os_distro: deb os_branch: debian remote-command: | - echo 'deb http://deb.debian.org/debian unstable main non-free contrib' | sudo tee -a /etc/apt/sources.list + if [ "$(. /etc/os-release && echo "$VERSION_CODENAME")" = "buster" ]; then + echo 'deb http://archive.debian.org/debian buster main non-free contrib' | sudo tee -a /etc/apt/sources.list + else + echo 'deb http://deb.debian.org/debian unstable main non-free contrib' | sudo tee -a /etc/apt/sources.list + fi sudo apt update sudo apt -y install openjdk-11-jdk diff --git a/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine.yml b/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine.yml index 99c185ce4d..2942a64c85 100644 --- a/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine.yml +++ b/utils/build/virtual_machine/weblogs/java/provision_test-app-java-alpine.yml @@ -6,7 +6,11 @@ lang_variant: os_distro: deb os_branch: debian remote-command: | - echo 'deb http://deb.debian.org/debian unstable main non-free contrib' | sudo tee -a /etc/apt/sources.list + if [ "$(. /etc/os-release && echo "$VERSION_CODENAME")" = "buster" ]; then + echo 'deb http://archive.debian.org/debian buster main non-free contrib' | sudo tee -a /etc/apt/sources.list + else + echo 'deb http://deb.debian.org/debian unstable main non-free contrib' | sudo tee -a /etc/apt/sources.list + fi sudo apt update sudo apt -y install openjdk-11-jdk diff --git a/utils/build/virtual_machine/weblogs/java/provision_test-app-java-container-jdk15.yml b/utils/build/virtual_machine/weblogs/java/provision_test-app-java-container-jdk15.yml index a6d19afcd8..5ab0189e65 100644 --- a/utils/build/virtual_machine/weblogs/java/provision_test-app-java-container-jdk15.yml +++ b/utils/build/virtual_machine/weblogs/java/provision_test-app-java-container-jdk15.yml @@ -7,7 +7,11 @@ lang_variant: os_distro: deb os_branch: debian remote-command: | - echo 'deb http://deb.debian.org/debian unstable main non-free contrib' | sudo tee -a /etc/apt/sources.list + if [ "$(. /etc/os-release && echo "$VERSION_CODENAME")" = "buster" ]; then + echo 'deb http://archive.debian.org/debian buster main non-free contrib' | sudo tee -a /etc/apt/sources.list + else + echo 'deb http://deb.debian.org/debian unstable main non-free contrib' | sudo tee -a /etc/apt/sources.list + fi sudo apt update sudo apt -y install openjdk-11-jdk @@ -37,7 +41,7 @@ weblog: - name: copy-docker-file local_path: utils/build/virtual_machine/weblogs/java/test-app-java-container/Dockerfile.jdk15 remote_path: Dockerfile.template - + - name: copy-java-app local_path: lib-injection/build/docker/java/jetty-app diff --git a/utils/build/virtual_machine/weblogs/java/provision_test-app-java-container.yml b/utils/build/virtual_machine/weblogs/java/provision_test-app-java-container.yml index 15fbda35d1..0645f8559b 100644 --- a/utils/build/virtual_machine/weblogs/java/provision_test-app-java-container.yml +++ b/utils/build/virtual_machine/weblogs/java/provision_test-app-java-container.yml @@ -6,7 +6,11 @@ lang_variant: os_distro: deb os_branch: debian remote-command: | - echo 'deb http://deb.debian.org/debian unstable main non-free contrib' | sudo tee -a /etc/apt/sources.list + if [ "$(. /etc/os-release && echo "$VERSION_CODENAME")" = "buster" ]; then + echo 'deb http://archive.debian.org/debian buster main non-free contrib' | sudo tee -a /etc/apt/sources.list + else + echo 'deb http://deb.debian.org/debian unstable main non-free contrib' | sudo tee -a /etc/apt/sources.list + fi sudo apt update sudo apt -y install openjdk-11-jdk diff --git a/utils/build/virtual_machine/weblogs/java/provision_test-app-java.yml b/utils/build/virtual_machine/weblogs/java/provision_test-app-java.yml index 9d16f486d7..280b69f56c 100644 --- a/utils/build/virtual_machine/weblogs/java/provision_test-app-java.yml +++ b/utils/build/virtual_machine/weblogs/java/provision_test-app-java.yml @@ -6,14 +6,18 @@ lang_variant: os_distro: deb os_branch: debian remote-command: | - echo 'deb http://deb.debian.org/debian unstable main non-free contrib' | sudo tee -a /etc/apt/sources.list + if [ "$(. /etc/os-release && echo "$VERSION_CODENAME")" = "buster" ]; then + echo 'deb http://archive.debian.org/debian buster main non-free contrib' | sudo tee -a /etc/apt/sources.list + else + echo 'deb http://deb.debian.org/debian unstable main non-free contrib' | sudo tee -a /etc/apt/sources.list + fi sudo apt update sudo apt -y install openjdk-11-jdk - + - os_type: linux os_distro: deb remote-command: sudo apt-get -y update && sudo apt-get -y install openjdk-11-jdk-headless - + - os_type: linux os_distro: rpm os_branch: amazon_linux2 @@ -45,4 +49,4 @@ weblog: - name: copy-java-app local_path: lib-injection/build/docker/java/jetty-app - remote-command: sh test-app-java_run.sh \ No newline at end of file + remote-command: sh test-app-java_run.sh