From 4f281ecf08694564b922bc91196de201bb4b8bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez?= Date: Mon, 2 Sep 2024 13:27:53 +0100 Subject: [PATCH 1/3] ci: add support for SUSE 15.6 --- .github/workflows/ci_build_docker_runner.yml | 1 + .github/workflows/testing.yml | 2 +- README.md | 1 + molecule/default/dockerfiles/suse15.6 | 13 +++++++++++++ prepare_platform.sh | 2 +- 5 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 molecule/default/dockerfiles/suse15.6 diff --git a/.github/workflows/ci_build_docker_runner.yml b/.github/workflows/ci_build_docker_runner.yml index 721a355..10a3a4b 100644 --- a/.github/workflows/ci_build_docker_runner.yml +++ b/.github/workflows/ci_build_docker_runner.yml @@ -38,6 +38,7 @@ jobs: - suse15.3 - suse15.4 - suse15.5 + - suse15.6 - ubuntu1604 - ubuntu1804 - ubuntu2004 diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 2463323..6893762 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -22,4 +22,4 @@ jobs: package_name: 'newrelic-infra' package_version: '1.52.3' gpg_key: 'https://download.newrelic.com/infrastructure_agent/gpg/newrelic-infra.gpg' - platforms: "al2,al2023,centos7,centos8,debian-bullseye,debian-buster,redhat8,redhat9,suse15.2,suse15.3,suse15.4,suse15.5,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204,ubuntu2404" + platforms: "al2,al2023,centos7,centos8,debian-bullseye,debian-buster,redhat8,redhat9,suse15.2,suse15.3,suse15.4,suse15.5,suse15.6,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204,ubuntu2404" diff --git a/README.md b/README.md index 367e0a9..991934a 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Github action that tests the correct installation of a given package and version - suse15.3 - suse15.4 - suse15.5 + - suse15.6 - ubuntu1604 - ubuntu1804 - ubuntu2004 diff --git a/molecule/default/dockerfiles/suse15.6 b/molecule/default/dockerfiles/suse15.6 new file mode 100644 index 0000000..2959397 --- /dev/null +++ b/molecule/default/dockerfiles/suse15.6 @@ -0,0 +1,13 @@ +FROM opensuse/leap:15.6 + +# Run a system update so the system doesn't overwrite the fake systemctl later +RUN zypper -n update + +RUN zypper -n install python3 sudo curl + +# Adding fake systemctl +RUN curl https://raw.githubusercontent.com/gdraheim/docker-systemctl-replacement/master/files/docker/systemctl3.py -o /usr/local/bin/systemctl + +RUN chmod +x /usr/local/bin/systemctl + +CMD ["/usr/local/bin/systemctl"] diff --git a/prepare_platform.sh b/prepare_platform.sh index 02580dc..2443a8c 100755 --- a/prepare_platform.sh +++ b/prepare_platform.sh @@ -24,7 +24,7 @@ This is a bash script to make generate a Molecule configutaion. exit fi -available_platforms=("al2" "al2023" "centos7" "centos8" "debian-bullseye" "debian-buster" "debian-bookworm" "redhat8" "redhat9" "suse15.2" "suse15.3" "suse15.4" "suse15.5" "ubuntu1604" "ubuntu1804" "ubuntu2004" "ubuntu2204" "ubuntu2404") +available_platforms=("al2" "al2023" "centos7" "centos8" "debian-bullseye" "debian-buster" "debian-bookworm" "redhat8" "redhat9" "suse15.2" "suse15.3" "suse15.4" "suse15.5" "suse15.6" "ubuntu1604" "ubuntu1804" "ubuntu2004" "ubuntu2204" "ubuntu2404") # check_platforms verifies that the provided platforms are available check_platforms() { From 4b73f7df49f236caf4a4690e5e4047a2229c8262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez?= Date: Mon, 2 Sep 2024 14:24:49 +0100 Subject: [PATCH 2/3] test(REVERT): SUSE 15.6 --- .github/workflows/testing.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 6893762..ec872b4 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -23,3 +23,21 @@ jobs: package_version: '1.52.3' gpg_key: 'https://download.newrelic.com/infrastructure_agent/gpg/newrelic-infra.gpg' platforms: "al2,al2023,centos7,centos8,debian-bullseye,debian-buster,redhat8,redhat9,suse15.2,suse15.3,suse15.4,suse15.5,suse15.6,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204,ubuntu2404" + +# TEST suse15.6 + molecule-packaging-tests-15-6: + name: Launch molecule tests with infra-agent package (SLES 15.6) + runs-on: ubuntu-latest + env: + TESTING: 'true' + steps: + - uses: actions/checkout@v2 + + - name: Molecule tests + uses: ./ + with: + repo_base_url: 'http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/davsanchez-sles15-6' + package_name: 'newrelic-infra' + package_version: '1.56.1' + gpg_key: 'https://download.newrelic.com/infrastructure_agent/gpg/newrelic-infra.gpg' + platforms: "suse15.5,suse15.6" \ No newline at end of file From df7b9ee6d0353cadab0c80151972bbe989ef1584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez?= Date: Mon, 2 Sep 2024 18:35:26 +0100 Subject: [PATCH 3/3] Revert "test(REVERT): SUSE 15.6" This reverts commit 4b73f7df49f236caf4a4690e5e4047a2229c8262. --- .github/workflows/testing.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index ec872b4..6893762 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -23,21 +23,3 @@ jobs: package_version: '1.52.3' gpg_key: 'https://download.newrelic.com/infrastructure_agent/gpg/newrelic-infra.gpg' platforms: "al2,al2023,centos7,centos8,debian-bullseye,debian-buster,redhat8,redhat9,suse15.2,suse15.3,suse15.4,suse15.5,suse15.6,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204,ubuntu2404" - -# TEST suse15.6 - molecule-packaging-tests-15-6: - name: Launch molecule tests with infra-agent package (SLES 15.6) - runs-on: ubuntu-latest - env: - TESTING: 'true' - steps: - - uses: actions/checkout@v2 - - - name: Molecule tests - uses: ./ - with: - repo_base_url: 'http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/davsanchez-sles15-6' - package_name: 'newrelic-infra' - package_version: '1.56.1' - gpg_key: 'https://download.newrelic.com/infrastructure_agent/gpg/newrelic-infra.gpg' - platforms: "suse15.5,suse15.6" \ No newline at end of file