test updates to adopt https://github.com/devcontainers/cli/pull/124

.github/workflows/test-all.yaml

@@ -37,13 +37,73 @@ jobs:
             "rust",
             "sshd",
             "terraform",
+        ]
+        baseImage:
+          [
+            "ubuntu:focal",
+            "ubuntu:jammy",
+            "debian:11",
+            "mcr.microsoft.com/devcontainers/base:ubuntu",
+            "mcr.microsoft.com/devcontainers/base:debian",
           ]
-        baseImage: [ "ubuntu:focal", "ubuntu:jammy", "debian:11", "mcr.microsoft.com/vscode/devcontainers/base:ubuntu", "mcr.microsoft.com/vscode/devcontainers/base:debian" ]
     steps:
       - uses: actions/checkout@v2
 
       - name: "Install latest devcontainer CLI"
-        run: npm install -g @devcontainers/cli@0.12.1
+        run: npm install -g @devcontainers/cli
 
-      - name: " Testing '${{ matrix.features }}' against '${{ matrix.baseImage }}'"
-        run: devcontainer features test -f ${{ matrix.features }} -i ${{ matrix.baseImage }} -c `pwd`
+      - name: "Generating tests for '${{ matrix.features }}' against '${{ matrix.baseImage }}'"
+        run: devcontainer features test  --skip-scenarios -f ${{ matrix.features }} -i ${{ matrix.baseImage }} .
+
+  test-scenarios:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    strategy:
+      matrix:
+        features: [
+            "anaconda",
+            "aws-cli",
+            "azure-cli",
+            "common-utils",
+            "desktop-lite",
+            "docker-from-docker",
+            "docker-in-docker",
+            "dotnet",
+            "git",
+            "git-lfs",
+            "github-cli",
+            "go",
+            "hugo",
+            "java",
+            "kubectl-helm-minikube",
+            "node",
+            "nvidia-cuda",
+            "oryx",
+            "php",
+            "powershell",
+            "python",
+            "ruby",
+            "rust",
+            "sshd",
+            "terraform",
+        ]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: "Install latest devcontainer CLI"
+        run: npm install -g @devcontainers/cli
+
+      - name: "Testing '${{ matrix.features }}' scenarios"
+        run: devcontainer features test -f ${{ matrix.features }} --skip-autogenerated  .
+
+  test-global:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: "Install latest devcontainer CLI"
+        run: npm install -g @devcontainers/cli
+
+      - name: "Testing global scenarios"
+        run: devcontainer features test --global-scenarios-only .

.github/workflows/test-manual.yaml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
     inputs:
       features:
-        description: "list of features to execute tests against"
+        description: "List of features to execute tests against"
         required: true
         default: "go dotnet"
       baseImage:
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: "Install latest devcontainer CLI"
-        run: npm install -g @devcontainers/cli@0.12.1
+        run: npm install -g @devcontainers/cli
 
       - name: "Testing '${{ github.event.inputs.features }}' against '${{ github.event.inputs.baseImage }}'"
-        run: devcontainer features test --features ${{ github.event.inputs.features }} --base-image ${{ github.event.inputs.baseImage }} --collection-folder `pwd` --log-level ${{ github.event.inputs.logLevel }}
+        run: devcontainer features test --features ${{ github.event.inputs.features }} --base-image ${{ github.event.inputs.baseImage }} --log-level ${{ github.event.inputs.logLevel }} .

.github/workflows/test-pr.yaml

@@ -1,4 +1,4 @@
-name: "PR -Test Updated Features"
+name: "PR - Test Updated Features"
 on:
   pull_request:
 
@@ -50,14 +50,30 @@ jobs:
             "ubuntu:focal",
             "ubuntu:jammy",
             "debian:11",
-            "mcr.microsoft.com/vscode/devcontainers/base:ubuntu",
-            "mcr.microsoft.com/vscode/devcontainers/base:debian",
+            "mcr.microsoft.com/devcontainers/base:ubuntu",
+            "mcr.microsoft.com/devcontainers/base:debian",
           ]
     steps:
       - uses: actions/checkout@v2
 
       - name: "Install latest devcontainer CLI"
-        run: npm install -g @devcontainers/cli@0.12.1
+        run: npm install -g @devcontainers/cli
 
-      - name: "Testing '${{ matrix.features }}' against '${{ matrix.baseImage }}'"
-        run: devcontainer features test -f ${{ matrix.features }} -i ${{ matrix.baseImage }} -c `pwd`
+      - name: "Generating tests for '${{ matrix.features }}' against '${{ matrix.baseImage }}'"
+        run: devcontainer features test  --skip-scenarios -f ${{ matrix.features }} -i ${{ matrix.baseImage }} .
+
+  test-scenarios:
+    needs: [detect-changes]
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    strategy:
+      matrix:
+        features: ${{ fromJSON(needs.detect-changes.outputs.features) }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: "Install latest devcontainer CLI"
+        run: npm install -g @devcontainers/cli
+
+      - name: "Testing '${{ matrix.features }}' scenarios"
+        run: devcontainer features test -f ${{ matrix.features }} --skip-autogenerated  .

test/_global/all_the_clis.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "check for aws" aws --version
+check "check for gh" gh --version
+check "check for azure" az  --version
+
+# Report result
+reportResults

test/_global/node_java_rust.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "check for node" node --version
+check "check for java" java --version
+check "check for rust" rustc  --version
+
+# Report result
+reportResults

test/_global/scenarios.json

@@ -0,0 +1,18 @@
+{
+    "all_the_clis": {
+        "image": "ubuntu:focal",
+        "features": {
+            "aws-cli": {},
+            "azure-cli": {},
+            "github-cli": {}
+        }
+    },
+    "node_java_rust": {
+        "image": "ubuntu:focal",
+        "features": {
+            "node": {},
+            "java": {},
+            "rust": {}
+        }
+    }
+}

test/dotnet/scenarios.json

@@ -0,0 +1,27 @@
+{
+    "install_additional_dotnet": {
+        "image": "ubuntu:focal",
+        "features": {
+            "dotnet": {
+                "version": "6.0.301",
+                "additionalVersions": "5.0,3.1.420"
+            }
+        }
+    },
+    "install_dotnet_3": {
+        "image": "ubuntu:focal",
+        "features": {
+            "dotnet": {
+                "version": "3"
+            }
+        }
+    },
+    "install_dotnet_5": {
+        "image": "ubuntu:focal",
+        "features": {
+            "dotnet": {
+                "version": "5"
+            }
+        }
+    }
+}