ci: update and cleanup CI tools used (#1326)

ratify-project · Mar 14, 2024 · c963bed · c963bed
1 parent 4288940
commit c963bed
Show file tree

Hide file tree

Showing 12 changed files with 128 additions and 82 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -73,7 +73,7 @@ jobs:
       - name: Test CLI
         run: |
           make install ratify-config install-bats
-          make test-e2e-cli LOCAL_REGISTRY_IMAGE=registry GOCOVERDIR=${GITHUB_WORKSPACE}/test/e2e/.cover
+          make test-e2e-cli GOCOVERDIR=${GITHUB_WORKSPACE}/test/e2e/.cover
       - name: Upload coverage to codecov.io
         uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
 

diff --git a/Makefile b/Makefile
diff --git a/config/samples/config_v1beta1_verifier_complete_licensechecker.yaml b/config/samples/config_v1beta1_verifier_complete_licensechecker.yaml
@@ -19,4 +19,6 @@ spec:
     - MIT AND LicenseRef-AND AND BSD-2-Clause AND LicenseRef-AND AND GPL-2.0-or-later
     - MPL-2.0 AND LicenseRef-AND AND MIT
     - BSD-2-Clause AND LicenseRef-AND AND BSD-3-Clause
-    - NONE
+    - NONE
+    - NOASSERTION
+    - ""
diff --git a/config/samples/config_v1beta1_verifier_schemavalidator.yaml b/config/samples/config_v1beta1_verifier_schemavalidator.yaml
@@ -4,7 +4,7 @@ metadata:
   name: verifier-schemavalidator
 spec:
   name: schemavalidator
-  artifactTypes: vnd.aquasecurity.trivy.report.sarif.v1
+  artifactTypes: application/vnd.aquasecurity.trivy.report.sarif.v1
   parameters: 
     schemas:
       application/sarif+json: https://json.schemastore.org/sarif-2.1.0-rtm.5.json
diff --git a/config/samples/config_v1beta1_verifier_schemavalidator_bad.yaml b/config/samples/config_v1beta1_verifier_schemavalidator_bad.yaml
@@ -4,7 +4,7 @@ metadata:
   name: verifier-schemavalidator
 spec:
   name: schemavalidator
-  artifactTypes: vnd.aquasecurity.trivy.report.sarif.v1
+  artifactTypes: application/vnd.aquasecurity.trivy.report.sarif.v1
   parameters: 
     schemas:
       application/sarif+json: https://json.schemastore.org/sourcehut-build-0.65.0.json
diff --git a/plugins/verifier/schemavalidator/README.md b/plugins/verifier/schemavalidator/README.md
@@ -8,7 +8,7 @@ Schemas can be configured in Ratify config.json or via CRD.
  "plugins": [
       {
         "name": "schemavalidator",
-        "artifactTypes": "vnd.aquasecurity.trivy.report.sarif.v1",
+        "artifactTypes": "application/vnd.aquasecurity.trivy.report.sarif.v1",
         "schemas": {
             "application/sarif+json": "https://json.schemastore.org/sarif-2.1.0-rtm.5.json"
           }
@@ -23,7 +23,7 @@ metadata:
   name: verifier-schemavalidator
 spec:
   name: schemavalidator
-  artifactTypes: vnd.aquasecurity.trivy.report.sarif.v1
+  artifactTypes: application/vnd.aquasecurity.trivy.report.sarif.v1
   parameters:
     schemas:
       application/sarif+json: https://json.schemastore.org/sarif-2.1.0-rtm.5.json

diff --git a/test/bats/tests/config/complete_licensechecker_config.json b/test/bats/tests/config/complete_licensechecker_config.json
@@ -36,7 +36,9 @@
                     "MIT AND LicenseRef-AND AND BSD-2-Clause AND LicenseRef-AND AND GPL-2.0-or-later",
                     "MPL-2.0 AND LicenseRef-AND AND MIT",
                     "BSD-2-Clause AND LicenseRef-AND AND BSD-3-Clause",
-                    "NONE"
+                    "NONE",
+                    "NOASSERTION",
+                    ""
                 ]
             }
         ]

diff --git a/test/bats/tests/config/config.json b/test/bats/tests/config/config.json
@@ -20,7 +20,7 @@
         "plugins": [
             {
                 "name": "schemavalidator",
-                "artifactTypes": "vnd.aquasecurity.trivy.report.sarif.v1",
+                "artifactTypes": "application/vnd.aquasecurity.trivy.report.sarif.v1",
                 "schemas": {
                     "application/sarif+json": "file:///home/runner/.ratify/schemas/sarif-2.1.0-rtm.5.json"
                 }
@@ -67,7 +67,7 @@
             },
             {
                 "name": "schemavalidator",
-                "artifactTypes": "vnd.aquasecurity.trivy.report.sarif.v1",
+                "artifactTypes": "application/vnd.aquasecurity.trivy.report.sarif.v1",
                 "schemas": {
                     "application/sarif+json": "https://json.schemastore.org/sarif-2.1.0-rtm.5.json"
                 }
@@ -88,7 +88,9 @@
                     "MIT AND LicenseRef-AND AND BSD-2-Clause AND LicenseRef-AND AND GPL-2.0-or-later",
                     "MPL-2.0 AND LicenseRef-AND AND MIT",
                     "BSD-2-Clause AND LicenseRef-AND AND BSD-3-Clause",
-                    "NONE"
+                    "NONE",
+                    "NOASSERTION",
+                    ""
                 ]
             }
         ]

diff --git a/test/bats/tests/config/config_external_verifier_with_type.json b/test/bats/tests/config/config_external_verifier_with_type.json
@@ -37,7 +37,9 @@
                     "MIT AND LicenseRef-AND AND BSD-2-Clause AND LicenseRef-AND AND GPL-2.0-or-later",
                     "MPL-2.0 AND LicenseRef-AND AND MIT",
                     "BSD-2-Clause AND LicenseRef-AND AND BSD-3-Clause",
-                    "NONE"
+                    "NONE",
+                    "NOASSERTION",
+                    ""
                 ]
             }
         ]

diff --git a/test/bats/tests/config/cosign_keyless_config.json b/test/bats/tests/config/cosign_keyless_config.json
@@ -19,7 +19,7 @@
         "plugins": [
             {
                 "name": "schemavalidator",
-                "artifactTypes": "vnd.aquasecurity.trivy.report.sarif.v1",
+                "artifactTypes": "application/vnd.aquasecurity.trivy.report.sarif.v1",
                 "schemas": {
                     "application/sarif+json": "file:///home/runner/.ratify/schemas/sarif-2.1.0-rtm.5.json"
                 }
@@ -63,7 +63,7 @@
             },
             {
                 "name": "schemavalidator",
-                "artifactTypes": "vnd.aquasecurity.trivy.report.sarif.v1",
+                "artifactTypes": "application/vnd.aquasecurity.trivy.report.sarif.v1",
                 "schemas": {
                     "application/sarif+json": "https://json.schemastore.org/sarif-2.1.0-rtm.5.json"
                 }
@@ -84,7 +84,9 @@
                     "MIT AND LicenseRef-AND AND BSD-2-Clause AND LicenseRef-AND AND GPL-2.0-or-later",
                     "MPL-2.0 AND LicenseRef-AND AND MIT",
                     "BSD-2-Clause AND LicenseRef-AND AND BSD-3-Clause",
-                    "NONE"
+                    "NONE",
+                    "NOASSERTION",
+                    ""
                 ]
             }
         ]

diff --git a/test/bats/tests/config/schemavalidator_config.json b/test/bats/tests/config/schemavalidator_config.json
@@ -19,7 +19,7 @@
         "plugins": [
             {
                 "name": "schemavalidator",
-                "artifactTypes": "vnd.aquasecurity.trivy.report.sarif.v1",
+                "artifactTypes": "application/vnd.aquasecurity.trivy.report.sarif.v1",
                 "schemas": {
                     "application/sarif+json": "file:///home/runner/.ratify/schemas/sarif-2.1.0-rtm.5.json"
                 }

diff --git a/test/bats/tests/config/zot-config.json b/test/bats/tests/config/zot-config.json
@@ -0,0 +1,14 @@
+{
+    "Storage": {
+      "RootDirectory": "/var/lib/registry"
+    },
+    "HTTP": {
+      "Address": "0.0.0.0",
+      "Port": "5000",
+      "Auth": {
+        "HTPasswd": {
+          "Path": "/etc/zot/htpasswd"
+        }
+      }
+    }
+}