chore update

.circleci/config.yml

@@ -142,9 +142,6 @@ commands:
       image:
         description: The image name + tag to run the tests on
         type: string
-      config:
-        description: The path to the config file that describes the test files
-        type: string
     steps:
       - run:
           name: Install Google Container Structure Test
@@ -158,9 +155,14 @@ commands:
       - run:
           name: Container Structure Tests 🧪
           command: |
-            container-structure-test test --image << parameters.image >> --config << parameters.config >> --test-report container-structure.xml --output junit
+            container-structure-test test --image << parameters.image >> --config focal.yaml --test-report container-structure.xml --output junit
+            if [ "<< parameters.arch >>" = "amd64" ] ; then
+              container-structure-test test --image << parameters.image >> --config focal-amd64.yaml --test-report container-structure-amd64.xml --output junit
+            fi
       - store_test_results:
           path: ./container-structure.xml
+      - store_test_results:
+          path: ./container-structure-amd64.xml
 
   runtime-tests:
     parameters:
@@ -235,7 +237,6 @@ jobs:
             - container-structure-tests:
                 arch: << parameters.executor >>
                 image: ${SHA1_IMAGE_URL}
-                config: focal.yaml
       # Conditionally push images (not for forked PRs)
       - when:
           condition: << parameters.push-images >>

focal-amd64.yaml

@@ -0,0 +1,19 @@
+schemaVersion: "2.0.0"
+
+commandTests:
+  - name: "Elm compiler"
+    command: "elm"
+    args: ["--version"]
+    expectedOutput: ["0.19.1"]
+
+  - name: binrc
+    command: "binrc"
+    args: ["version"]
+    expectedOutput:
+      - ^[0-9a-f]{40} # matches a git long sha
+
+  - name: "Homebrew"
+    command: "brew"
+    args: ["--version"]
+    expectedOutput:
+      - Homebrew 3\.5\.\d+

focal.yaml

@@ -65,11 +65,6 @@ fileExistenceTests:
     gid: 2500 # buildbot
 
 commandTests:
-  - name: "Elm compiler"
-    command: "elm"
-    args: ["--version"]
-    expectedOutput: ["0.19.1"]
-
   - name: "zstd compression library"
     command: "zstd"
     args: ["--version"]
@@ -106,12 +101,6 @@ commandTests:
     args: ["version"]
     expectedOutput: ["hugo v0.101.0"]
 
-  - name: binrc
-    command: "binrc"
-    args: ["version"]
-    expectedOutput:
-      - ^[0-9a-f]{40} # matches a git long sha
-
   - name: lz4 compression
     command: "lz4"
     args: ["--version"]
@@ -145,13 +134,6 @@ commandTests:
     args: ["--version"]
     expectedOutput: ["swiftenv 1.5.0"]
 
-  # HOMEBREW does not exist on arm64
-  # - name: "Homebrew"
-  #   command: "brew"
-  #   args: ["--version"]
-  #   expectedOutput:
-  #     - Homebrew 3\.5\.\d+
-
   - name: "Rustup"
     command: "rustup"
     args: ["--version"]