WIP: assume wolfi-base for all package tests

Signed-off-by: Jason Hall <[email protected]>
wolfi-dev · Feb 20, 2024 · 77e9772 · 77e9772
1 parent 08a9b99
commit 77e9772
Show file tree

Hide file tree

Showing 81 changed files with 5 additions and 265 deletions.
diff --git a/Makefile b/Makefile
@@ -33,6 +33,7 @@ MELANGE_TEST_OPTS += --arch ${ARCH}
 MELANGE_TEST_OPTS += --pipeline-dirs ./pipelines/
 MELANGE_TEST_OPTS += --repository-append https://packages.wolfi.dev/os
 MELANGE_TEST_OPTS += --keyring-append https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
+MELANGE_TEST_OPTS += --test-package-append wolfi-base
 MELANGE_TEST_OPTS += ${MELANGE_EXTRA_OPTS}
 
 ifeq (${USE_CACHE}, yes)

diff --git a/atuin.yaml b/atuin.yaml
@@ -44,10 +44,6 @@ update:
     strip-prefix: v
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         atuin -V
diff --git a/az.yaml b/az.yaml
@@ -61,10 +61,6 @@ update:
     strip-prefix: azure-cli-
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         az --version
diff --git a/bazel-6.yaml b/bazel-6.yaml
@@ -52,7 +52,6 @@ test:
   environment:
     contents:
       packages:
-        - wolfi-base
         - openjdk-17
         - openjdk-17-default-jvm
   pipeline:

diff --git a/brew.yaml b/brew.yaml
@@ -75,10 +75,6 @@ update:
     identifier: Homebrew/brew
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         . /etc/profile.d/brew.sh

diff --git a/buildkitd.yaml b/buildkitd.yaml
@@ -67,7 +67,6 @@ test:
   environment:
     contents:
       packages:
-        - busybox
         - runc
   pipeline:
     - runs: |

diff --git a/bun-bootstrap.yaml b/bun-bootstrap.yaml
@@ -25,10 +25,6 @@ update:
   enabled: false
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         bun --version
diff --git a/bun.yaml b/bun.yaml
@@ -69,10 +69,6 @@ update:
     strip-prefix: bun-v
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         bun --version

diff --git a/busybox.yaml b/busybox.yaml
@@ -123,10 +123,6 @@ subpackages:
             done
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         busybox --help

diff --git a/cassandra.yaml b/cassandra.yaml
@@ -73,10 +73,6 @@ update:
     strip-prefix: cassandra-
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         cqlsh --version
diff --git a/cbindgen.yaml b/cbindgen.yaml
@@ -29,7 +29,6 @@ test:
   environment:
     contents:
       packages:
-        - wolfi-base
         - rustup
   pipeline:
     - runs: |

diff --git a/checksec.yaml b/checksec.yaml
@@ -39,10 +39,6 @@ update:
     identifier: slimm609/checksec.sh
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         checksec --file=/bin/ls --format=csv | grep "Full RELRO,Canary found"
diff --git a/controller-gen.yaml b/controller-gen.yaml
@@ -30,10 +30,6 @@ update:
     strip-prefix: v
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         controller-gen --version
diff --git a/couchdb.yaml b/couchdb.yaml
@@ -72,8 +72,6 @@ test:
   environment:
     contents:
       packages:
-        - busybox
-        - apk-tools
         - curl
         - jq
   pipeline:

diff --git a/curl.yaml b/curl.yaml
@@ -76,10 +76,6 @@ update:
     strip-prefix: curl-
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         curl --version

diff --git a/delta.yaml b/delta.yaml
@@ -28,10 +28,6 @@ pipeline:
   - uses: strip
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         delta --version

diff --git a/direnv.yaml b/direnv.yaml
@@ -35,10 +35,6 @@ update:
     strip-prefix: v
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         direnv version
diff --git a/dua.yaml b/dua.yaml
@@ -37,10 +37,6 @@ update:
     strip-prefix: v
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         dua -V
diff --git a/eza.yaml b/eza.yaml
@@ -40,10 +40,6 @@ update:
     tag-filter-prefix: v
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         eza

diff --git a/filebeat.yaml b/filebeat.yaml
@@ -70,11 +70,6 @@ update:
     identifier: elastic/beats
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
-        - filebeat
   pipeline:
     - runs: |
         filebeat version

diff --git a/gh.yaml b/gh.yaml
@@ -33,10 +33,6 @@ update:
     strip-prefix: v
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         gh --version
diff --git a/git.yaml b/git.yaml
@@ -105,10 +105,6 @@ subpackages:
         - runs: ls /usr/local/etc/profile.d/*.bash
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: git --version
 

diff --git a/gnutar.yaml b/gnutar.yaml
@@ -41,10 +41,6 @@ update:
     identifier: 4939
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         tar czf - $(dirname $(which tar)) | tar -tzv | grep tar
diff --git a/gobump.yaml b/gobump.yaml
@@ -28,10 +28,6 @@ update:
     use-tag: true
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         gobump version
diff --git a/google-cloud-sdk.yaml b/google-cloud-sdk.yaml
@@ -79,10 +79,6 @@ pipeline:
   - uses: strip
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: gcloud --version
     - runs: gsutil --version

diff --git a/gpsd.yaml b/gpsd.yaml
@@ -87,10 +87,6 @@ update:
     identifier: 6846
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         gpsd --version
diff --git a/grype.yaml b/grype.yaml
@@ -32,10 +32,6 @@ update:
     strip-prefix: v
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         grype --version
diff --git a/hello-wolfi.yaml b/hello-wolfi.yaml
@@ -44,10 +44,6 @@ update:
     identifier: 18057
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         hello
diff --git a/k9s.yaml b/k9s.yaml
@@ -36,10 +36,6 @@ update:
     strip-prefix: v
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         k9s version
diff --git a/kubeflow-volumes-web-app.yaml b/kubeflow-volumes-web-app.yaml
@@ -79,10 +79,6 @@ update:
     strip-prefix: v
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         python3 -c "import urllib3"

diff --git a/kwok.yaml b/kwok.yaml
@@ -41,7 +41,6 @@ test:
   environment:
     contents:
       packages:
-        - busybox
         - kubectl-default
         - kwokctl
         - kubernetes

diff --git a/lazygit.yaml b/lazygit.yaml
@@ -47,10 +47,6 @@ update:
     strip-prefix: v
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         lazygit --version
diff --git a/lint.sh b/lint.sh
@@ -24,4 +24,8 @@ for p in $(make list); do
     yq -i 'del(.environment.contents.repositories)' ${fn}
     yq -i 'del(.environment.contents.keyring)' ${fn}
   fi
+
+  if grep -q 'test:' ${fn}; then
+    yq -i 'del(.test.environment)' ${fn}
+  fi
 done
diff --git a/linux-pam.yaml b/linux-pam.yaml
@@ -78,7 +78,6 @@ test:
   environment:
     contents:
       packages:
-        - wolfi-base
         - util-linux
         - shadow
   pipeline:

diff --git a/logstash-exporter.yaml b/logstash-exporter.yaml
@@ -41,10 +41,6 @@ update:
     use-tag: true
 
 test:
-  environment:
-    contents:
-      packages:
-        - wolfi-base
   pipeline:
     - runs: |
         logstash-exporter -version
diff --git a/logstash-filter-xml.yaml b/logstash-filter-xml.yaml
@@ -52,7 +52,6 @@ test:
   environment:
     contents:
       packages:
-        - wolfi-base
         - logstash
         - openjdk-17-default-jvm
   pipeline:

diff --git a/logstash-integration-jdbc.yaml b/logstash-integration-jdbc.yaml
@@ -52,7 +52,6 @@ test:
   environment:
     contents:
       packages:
-        - wolfi-base
         - logstash
         - openjdk-11-default-jvm
         - jruby-9.4

diff --git a/logstash-output-opensearch.yaml b/logstash-output-opensearch.yaml
@@ -52,7 +52,6 @@ test:
   environment:
     contents:
       packages:
-        - wolfi-base
         - logstash
         - openjdk-17-default-jvm
   pipeline:

diff --git a/logstash.yaml b/logstash.yaml
@@ -245,9 +245,6 @@ subpackages:
 
 test:
   environment:
-    contents:
-      packages:
-        - wolfi-base
     environment:
       LS_JAVA_HOME: /usr/lib/jvm/default-jvm
   pipeline: