Image import inspection: update inspection stage to support archlinux…

… and clearlinux distros (#1822)
yswe · Dec 29, 2021 · 3da40bb · 3da40bb
1 parent bc23e33
commit 3da40bb
Show file tree

Hide file tree

Showing 15 changed files with 284 additions and 95 deletions.
diff --git a/daisy_workflows/image_import/inspection/src/boot_inspect/inspection.py b/daisy_workflows/image_import/inspection/src/boot_inspect/inspection.py
@@ -90,6 +90,10 @@
     linux.Fingerprint(inspect_pb2.Distro.ORACLE,
                       aliases=['ol', 'oraclelinux']),
     linux.Fingerprint(inspect_pb2.Distro.UBUNTU),
+    linux.Fingerprint(inspect_pb2.Distro.ARCH,
+                  aliases=['arch', 'archlinux']),
+    linux.Fingerprint(inspect_pb2.Distro.CLEAR,
+                  aliases=['clear', 'clearlinux', 'clear-linux-os']),
 ]
 
 

diff --git a/...rkflows/image_import/inspection/tests/test-data/images/docker-image-archlinux-latest.yaml b/...rkflows/image_import/inspection/tests/test-data/images/docker-image-archlinux-latest.yaml
@@ -0,0 +1,17 @@
+source: docker image archlinux:latest
+expected:
+  distro: arch
+  major:
+  minor:
+files:
+  /etc/os-release: |
+    NAME="Arch Linux"
+    PRETTY_NAME="Arch Linux"
+    ID=arch
+    BUILD_ID=rolling
+    ANSI_COLOR="38;2;23;147;209"
+    HOME_URL="https://archlinux.org/"
+    DOCUMENTATION_URL="https://wiki.archlinux.org/"
+    SUPPORT_URL="https://bbs.archlinux.org/"
+    BUG_REPORT_URL="https://bugs.archlinux.org/"
+    LOGO=archlinux-logo
diff --git a/...ws/image_import/inspection/tests/test-data/images/docker-image-clear-linux-os-latest.yaml b/...ws/image_import/inspection/tests/test-data/images/docker-image-clear-linux-os-latest.yaml
@@ -0,0 +1,19 @@
+source: docker image clearlinux:latest
+expected:
+  distro: clear
+  major: 35440
+  minor:
+files:
+  /etc/os-release: |
+    NAME="Clear Linux OS"
+    VERSION=1
+    ID=clear-linux-os
+    ID_LIKE=clear-linux-os
+    VERSION_ID=35440
+    PRETTY_NAME="Clear Linux OS"
+    ANSI_COLOR="1;35"
+    HOME_URL="https://clearlinux.org"
+    SUPPORT_URL="https://clearlinux.org"
+    BUG_REPORT_URL="mailto:[email protected]"
+    PRIVACY_POLICY_URL="http://www.intel.com/privacy"
+    BUILD_ID=35440
diff --git a/daisy_workflows/image_import/inspection/tests/test-data/images/docker-image-debian-11.2.yaml b/daisy_workflows/image_import/inspection/tests/test-data/images/docker-image-debian-11.2.yaml
@@ -0,0 +1,18 @@
+source: docker image debian:11.2
+expected:
+  distro: debian
+  major: '11'
+  minor: '2'
+files:
+  /etc/debian_version: |
+    11.2
+  /etc/os-release: |
+    PRETTY_NAME="Debian GNU/Linux 11 (bullseye)"
+    NAME="Debian GNU/Linux"
+    VERSION_ID="11"
+    VERSION="11 (bullseye)"
+    VERSION_CODENAME=bullseye
+    ID=debian
+    HOME_URL="https://www.debian.org/"
+    SUPPORT_URL="https://www.debian.org/support"
+    BUG_REPORT_URL="https://bugs.debian.org/"
diff --git a/daisy_workflows/image_import/inspection/tests/test-data/images/gcp-archlinux-latest.yaml b/daisy_workflows/image_import/inspection/tests/test-data/images/gcp-archlinux-latest.yaml
@@ -0,0 +1,19 @@
+# refrence https://github.com/GoogleCloudPlatform/compute-archlinux-image-builder
+
+source: gcp image archlinux:latest
+expected:
+  distro: arch
+  major:
+  minor:
+files:
+  /etc/os-release: |
+    NAME="Arch Linux"
+    PRETTY_NAME="Arch Linux"
+    ID=arch
+    BUILD_ID=rolling
+    ANSI_COLOR="38;2;23;147;209"
+    HOME_URL="https://www.archlinux.org/"
+    DOCUMENTATION_URL="https://wiki.archlinux.org/"
+    SUPPORT_URL="https://bbs.archlinux.org/"
+    BUG_REPORT_URL="https://bugs.archlinux.org/"
+    LOGO=archlinux
diff --git a/...mage_import/inspection/tests/test-data/images/gcp-image-debian-11-bullseye-v20211209.yaml b/...mage_import/inspection/tests/test-data/images/gcp-image-debian-11-bullseye-v20211209.yaml
@@ -0,0 +1,18 @@
+source: GCP image 'debian-10-buster-v20200714'
+expected:
+  distro: debian
+  major: 11
+  minor: 1
+files:
+  /etc/debian_version: |
+    11.1
+  /etc/os-release: |
+    PRETTY_NAME="Debian GNU/Linux 11 (bullseye)"
+    NAME="Debian GNU/Linux"
+    VERSION_ID="11"
+    VERSION="11 (bullseye)"
+    VERSION_CODENAME=bullseye
+    ID=debian
+    HOME_URL="https://www.debian.org/"
+    SUPPORT_URL="https://www.debian.org/support"
+    BUG_REPORT_URL="https://bugs.debian.org/"
diff --git a/...s/image_import/inspection/tests/test-data/images/gcp-image-sles-15-sp3-sap-v20211113.yaml b/...s/image_import/inspection/tests/test-data/images/gcp-image-sles-15-sp3-sap-v20211113.yaml
@@ -0,0 +1,17 @@
+source: GCP image 'sles-15-sp3-sap-v20211113'
+expected:
+  distro: sles-sap
+  major: 15
+  minor: 3
+files:
+  /etc/os-release: |
+    NAME="SLES"
+    VERSION="15-SP3"
+    VERSION_ID="15.3"
+    PRETTY_NAME="SUSE Linux Enterprise Server 15 SP3"
+    ID="sles"
+    ID_LIKE="suse"
+    ANSI_COLOR="0;32"
+    CPE_NAME="cpe:/o:suse:sles:15:sp3"
+    VARIANT_ID="sles-sap"
+  /etc/products.d/SLES_SAP.prod: <?xml version="1.0" encoding="UTF-8"?>
diff --git a/proto/go/pb/inspect.pb.go b/proto/go/pb/inspect.pb.go
diff --git a/proto/go/pb/output_info.pb.go b/proto/go/pb/output_info.pb.go
diff --git a/proto/inspect.proto b/proto/inspect.proto
@@ -48,6 +48,8 @@ enum Distro {
   AMAZON = 4003;
   ORACLE = 4004;
   ROCKY = 4005;
+  ARCH = 4006;
+  CLEAR = 4007;
 }
 
 enum Architecture {

diff --git a/proto/py/compute_image_tools_proto/inspect_pb2.py b/proto/py/compute_image_tools_proto/inspect_pb2.py