diff --git a/.github/workflows/install-instructions-test.yml b/.github/workflows/install-instructions-test.yml index b3439e01a161..b0d5cbd5cce5 100644 --- a/.github/workflows/install-instructions-test.yml +++ b/.github/workflows/install-instructions-test.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - distro: [ubuntu, rhel, amazon-linux, debian, centos] + distro: [ubuntu, rhel, amazon-linux, debian] arch: ["linux/amd64", "linux/arm64"] runs-on: ubuntu-latest timeout-minutes: 60 diff --git a/tools/install-tester/config/jobs.yaml b/tools/install-tester/config/jobs.yaml index 9d9a477e03a4..d17d793df38c 100644 --- a/tools/install-tester/config/jobs.yaml +++ b/tools/install-tester/config/jobs.yaml @@ -29,7 +29,7 @@ distros: - amazon-linux - ubuntu - - rhel:7 + - rhel:9 - debian arch: - linux/amd64 @@ -43,15 +43,11 @@ - enterprise distros: - ubuntu - - rhel:7 + - rhel:8 - amazon-linux - debian - - centos arch: - linux/amd64 - skip: - - 2.8.x/centos/oss/package # No OSS package for 2.8 - - 2.8.x/centos/oss/repository # No OSS package for 2.8 outputs: enterprise: "Kong Enterprise {{ version }}" oss: "{{ version }}" diff --git a/tools/install-tester/config/setup.yaml b/tools/install-tester/config/setup.yaml index 592574fb4128..98626c8a2281 100644 --- a/tools/install-tester/config/setup.yaml +++ b/tools/install-tester/config/setup.yaml @@ -14,8 +14,8 @@ debian: - useradd tester -m -p password - usermod -aG sudo tester - "echo 'ALL ALL = (ALL) NOPASSWD: ALL' > /etc/sudoers.d/tester" -"rhel:7": - image: "registry.access.redhat.com/ubi7/ubi-init:latest" +"rhel:8": + image: "registry.access.redhat.com/ubi8/ubi-init:latest" setup: - yum install -y curl gpg sudo - useradd tester -m -p password @@ -32,9 +32,3 @@ amazon-linux: - yum install -y curl gpg sudo shadow-utils util-linux - useradd tester -m -p password - "echo 'ALL ALL = (ALL) NOPASSWD: ALL' > /etc/sudoers.d/tester" -centos: - image: "centos:centos7" - setup: - - yum install -y curl gpg sudo - - useradd tester -m -p password - - "echo 'ALL ALL = (ALL) NOPASSWD: ALL' > /etc/sudoers.d/tester" diff --git a/tools/install-tester/index.js b/tools/install-tester/index.js index 80b1316f11b6..4f078f09ff70 100644 --- a/tools/install-tester/index.js +++ b/tools/install-tester/index.js @@ -134,34 +134,8 @@ async function runSingleJob(distro, job, arch, installOption, conditions) { ); if (expected !== version) { - // Check if the package exists on download.konghq.com - // Only supports RHEL at the moment - let existsOnOldSite = "❓"; - const expectedParts = expected.split(" "); - const expectedVersion = expectedParts[expectedParts.length - 1]; - let packageArch = arch.replace("linux/", ""); - - let packageName = "kong"; - if (installOption.package == "enterprise") { - packageName = "kong-enterprise-edition"; - } - - if (distro === "rhel") { - // 2.x packages are noarch for enterprise on RHEL - if ( - installOption.package == "enterprise" && - expectedVersion[0] == "2" - ) { - packageArch = "noarch"; - } - url = `https://download.konghq.com/gateway-${expectedVersion[0]}.x-rhel-7/Packages/k/${packageName}-${expectedVersion}.rhel7.${packageArch}.rpm`; - - const response = await fetch(url, { method: "HEAD" }); - existsOnOldSite = response.status != 404 ? "✅" : "❌"; - } - console.log( - `❌ ${summary} Expected: ${expected}, Got: ${version}, Exists on download.konghq.com: ${existsOnOldSite}`, + `❌ ${summary} Expected: ${expected}, Got: ${version}`, ); process.exitCode = 1;