From e76b9702eabd8c3d163ce2482978834228525eb9 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Thu, 7 Mar 2024 17:48:16 -0700 Subject: [PATCH 1/5] Test with Clear Linux 41150 --- .../platformlabeler/clearlinux/{40830 => 41150}/Dockerfile | 0 .../platformlabeler/clearlinux/{40830 => 41150}/os-release | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/test/resources/org/jvnet/hudson/plugins/platformlabeler/clearlinux/{40830 => 41150}/Dockerfile (100%) rename src/test/resources/org/jvnet/hudson/plugins/platformlabeler/clearlinux/{40830 => 41150}/os-release (90%) diff --git a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/clearlinux/40830/Dockerfile b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/clearlinux/41150/Dockerfile similarity index 100% rename from src/test/resources/org/jvnet/hudson/plugins/platformlabeler/clearlinux/40830/Dockerfile rename to src/test/resources/org/jvnet/hudson/plugins/platformlabeler/clearlinux/41150/Dockerfile diff --git a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/clearlinux/40830/os-release b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/clearlinux/41150/os-release similarity index 90% rename from src/test/resources/org/jvnet/hudson/plugins/platformlabeler/clearlinux/40830/os-release rename to src/test/resources/org/jvnet/hudson/plugins/platformlabeler/clearlinux/41150/os-release index 6acfa1917..e78529623 100644 --- a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/clearlinux/40830/os-release +++ b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/clearlinux/41150/os-release @@ -2,11 +2,11 @@ NAME="Clear Linux OS" VERSION=1 ID=clear-linux-os ID_LIKE=clear-linux-os -VERSION_ID=40830 +VERSION_ID=41150 PRETTY_NAME="Clear Linux OS" ANSI_COLOR="1;35" HOME_URL="https://clearlinux.org" SUPPORT_URL="https://clearlinux.org" BUG_REPORT_URL="mailto:dev@lists.clearlinux.org" PRIVACY_POLICY_URL="http://www.intel.com/privacy" -BUILD_ID=40830 +BUILD_ID=41150 From d00871495c8eba464e062cb158521307e1576684 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Thu, 7 Mar 2024 17:51:13 -0700 Subject: [PATCH 2/5] Update Fedora 39 test data --- .../hudson/plugins/platformlabeler/fedora/39/lsb_release-a | 2 +- .../jvnet/hudson/plugins/platformlabeler/fedora/39/os-release | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/fedora/39/lsb_release-a b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/fedora/39/lsb_release-a index 06e9b39f7..db160ef61 100644 --- a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/fedora/39/lsb_release-a +++ b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/fedora/39/lsb_release-a @@ -1,4 +1,4 @@ -LSB Version: +LSB Version: :core-5.0-amd64:core-5.0-noarch Distributor ID: Fedora Description: Fedora release 39 (Thirty Nine) Release: 39 diff --git a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/fedora/39/os-release b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/fedora/39/os-release index 26c8fbaf0..9d04f7e37 100644 --- a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/fedora/39/os-release +++ b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/fedora/39/os-release @@ -17,6 +17,6 @@ REDHAT_BUGZILLA_PRODUCT="Fedora" REDHAT_BUGZILLA_PRODUCT_VERSION=39 REDHAT_SUPPORT_PRODUCT="Fedora" REDHAT_SUPPORT_PRODUCT_VERSION=39 -SUPPORT_END=2024-05-14 +SUPPORT_END=2024-11-12 VARIANT="Container Image" VARIANT_ID=container From c8d7f18f92efec6fa2a8755177d0137c5026e732 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Thu, 7 Mar 2024 17:51:47 -0700 Subject: [PATCH 3/5] Test with Ubuntu 22.04.4 data --- .../hudson/plugins/platformlabeler/ubuntu/22.04/lsb_release-a | 2 +- .../hudson/plugins/platformlabeler/ubuntu/22.04/os-release | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/ubuntu/22.04/lsb_release-a b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/ubuntu/22.04/lsb_release-a index 3a427e27b..5dde0efa7 100644 --- a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/ubuntu/22.04/lsb_release-a +++ b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/ubuntu/22.04/lsb_release-a @@ -1,5 +1,5 @@ No LSB modules are available. Distributor ID: Ubuntu -Description: Ubuntu 22.04.3 LTS +Description: Ubuntu 22.04.4 LTS Release: 22.04 Codename: jammy diff --git a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/ubuntu/22.04/os-release b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/ubuntu/22.04/os-release index 39240aa54..9027a5785 100644 --- a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/ubuntu/22.04/os-release +++ b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/ubuntu/22.04/os-release @@ -1,7 +1,7 @@ -PRETTY_NAME="Ubuntu 22.04.3 LTS" +PRETTY_NAME="Ubuntu 22.04.4 LTS" NAME="Ubuntu" VERSION_ID="22.04" -VERSION="22.04.3 LTS (Jammy Jellyfish)" +VERSION="22.04.4 LTS (Jammy Jellyfish)" VERSION_CODENAME=jammy ID=ubuntu ID_LIKE=debian From 1f6f054876374e7440c93cd9041564720a7d4ea9 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Thu, 7 Mar 2024 17:50:45 -0700 Subject: [PATCH 4/5] Add openSUSE Leap 15.6 --- .../platformlabeler/opensuse-leap/15.6/Dockerfile | 2 ++ .../platformlabeler/opensuse-leap/15.6/lsb_release-a | 5 +++++ .../platformlabeler/opensuse-leap/15.6/os-release | 12 ++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-leap/15.6/Dockerfile create mode 100644 src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-leap/15.6/lsb_release-a create mode 100644 src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-leap/15.6/os-release diff --git a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-leap/15.6/Dockerfile b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-leap/15.6/Dockerfile new file mode 100644 index 000000000..1fd3f780b --- /dev/null +++ b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-leap/15.6/Dockerfile @@ -0,0 +1,2 @@ +FROM opensuse/leap:15.6 +RUN zypper --non-interactive install -y lsb-release diff --git a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-leap/15.6/lsb_release-a b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-leap/15.6/lsb_release-a new file mode 100644 index 000000000..7c38e2b4b --- /dev/null +++ b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-leap/15.6/lsb_release-a @@ -0,0 +1,5 @@ +LSB Version: n/a +Distributor ID: openSUSE +Description: openSUSE Leap 15.6 Alpha +Release: 15.6 +Codename: n/a diff --git a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-leap/15.6/os-release b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-leap/15.6/os-release new file mode 100644 index 000000000..ef46a8346 --- /dev/null +++ b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-leap/15.6/os-release @@ -0,0 +1,12 @@ +NAME="openSUSE Leap" +VERSION="15.6 Alpha" +ID="opensuse-leap" +ID_LIKE="suse opensuse" +VERSION_ID="15.6" +PRETTY_NAME="openSUSE Leap 15.6 Alpha" +ANSI_COLOR="0;32" +CPE_NAME="cpe:/o:opensuse:leap:15.6" +BUG_REPORT_URL="https://bugs.opensuse.org" +HOME_URL="https://www.opensuse.org/" +DOCUMENTATION_URL="https://en.opensuse.org/Portal:Leap" +LOGO="distributor-logo-Leap" From a82d69a825a76080f7142c560e85d152bd847a2b Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Thu, 7 Mar 2024 17:52:37 -0700 Subject: [PATCH 5/5] Test with openSUSE tumbleweed 20240306 --- .../opensuse-tumbleweed/{20240214 => 20240306}/Dockerfile | 0 .../opensuse-tumbleweed/{20240214 => 20240306}/os-release | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-tumbleweed/{20240214 => 20240306}/Dockerfile (100%) rename src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-tumbleweed/{20240214 => 20240306}/os-release (71%) diff --git a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-tumbleweed/20240214/Dockerfile b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-tumbleweed/20240306/Dockerfile similarity index 100% rename from src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-tumbleweed/20240214/Dockerfile rename to src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-tumbleweed/20240306/Dockerfile diff --git a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-tumbleweed/20240214/os-release b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-tumbleweed/20240306/os-release similarity index 71% rename from src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-tumbleweed/20240214/os-release rename to src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-tumbleweed/20240306/os-release index 077b1826c..20721d494 100644 --- a/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-tumbleweed/20240214/os-release +++ b/src/test/resources/org/jvnet/hudson/plugins/platformlabeler/opensuse-tumbleweed/20240306/os-release @@ -1,14 +1,14 @@ NAME="openSUSE Tumbleweed" -# VERSION="20240214" +# VERSION="20240306" ID="opensuse-tumbleweed" ID_LIKE="opensuse suse" -VERSION_ID="20240214" +VERSION_ID="20240306" PRETTY_NAME="openSUSE Tumbleweed" ANSI_COLOR="0;32" # CPE 2.3 format, boo#1217921 -CPE_NAME="cpe:2.3:o:opensuse:tumbleweed:20240214:*:*:*:*:*:*:*" +CPE_NAME="cpe:2.3:o:opensuse:tumbleweed:20240306:*:*:*:*:*:*:*" #CPE 2.2 format -#CPE_NAME="cpe:/o:opensuse:tumbleweed:20240214" +#CPE_NAME="cpe:/o:opensuse:tumbleweed:20240306" BUG_REPORT_URL="https://bugzilla.opensuse.org" SUPPORT_URL="https://bugs.opensuse.org" HOME_URL="https://www.opensuse.org"