test updates to adopt https://github.com/devcontainers/cli/pull/124 (#114)

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

* remove accidental tgz check in

* typo in option

* typo in python install script on dotnet6/jammy branch

* no scenarios

* code review and test name

* Delete install_os_provided_python.sh

16 files changed, 0 insertions, 345 deletions

diff --git a/test-scenarios/install_additional_dotnet.sh b/test-scenarios/install_additional_dotnet.sh
deleted file mode 100644
index fdb2da7..0000000
--- a/test-scenarios/install_additional_dotnet.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "dotnet version 6.0.301 installed as default" dotnet --version | grep 6.0.301
-check "dotnet version 5.0 installed"  ls -l /usr/local/dotnet | grep 5.0
-check "dotnet version 3.1.420 installed"  ls -l /usr/local/dotnet | grep 3.1.420
-
-# Report result
-reportResults
diff --git a/test-scenarios/install_additional_java.sh b/test-scenarios/install_additional_java.sh
deleted file mode 100644
index a796fee..0000000
--- a/test-scenarios/install_additional_java.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "java version 17 installed as default" java --version | grep 17
-check "java version 11 installed"  ls /usr/local/sdkman/candidates/java  | grep 11
-check "java version 8 installed"  ls /usr/local/sdkman/candidates/java | grep 8
-
-# Report result
-reportResults
diff --git a/test-scenarios/install_additional_node.sh b/test-scenarios/install_additional_node.sh
deleted file mode 100644
index 83dae86..0000000
--- a/test-scenarios/install_additional_node.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-# 'latest' is some version of node 18 for a while.
-check "version_on_path"  node -v | grep 18
-
-check "v18_installed" ls -1 /usr/local/share/nvm/versions/node | grep 18
-check "v14_installed" ls -1 /usr/local/share/nvm/versions/node | grep 14.19.3
-check "v17_installed" ls -1 /usr/local/share/nvm/versions/node | grep 17.9.1
-
-
-# Report result
-reportResults
diff --git a/test-scenarios/install_additional_php.sh b/test-scenarios/install_additional_php.sh
deleted file mode 100644
index 590187a..0000000
--- a/test-scenarios/install_additional_php.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "php version 8.1.4 installed as default" php --version | grep 8.1.4
-check "php version 8.0.17 installed"   ls -l /usr/local/php | grep 8.0.17
-check "php version 8.0.3 installed"  ls -l /usr/local/php | grep 8.0.3
-
-# Report result
-reportResults
diff --git a/test-scenarios/install_additional_python.sh b/test-scenarios/install_additional_python.sh
deleted file mode 100644
index b0393d3..0000000
--- a/test-scenarios/install_additional_python.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "python version 3.10.5 installed as default" python --version | grep 3.10.5
-check "python3 version 3.10.5 installed as default" python3 --version | grep 3.10.5
-check "python version 3.8.13 installed"  ls -l /usr/local/python | grep 3.8.13
-check "python version 3.9.13 installed"  ls -l /usr/local/python | grep 3.9.13
-
-# Report result
-reportResults
diff --git a/test-scenarios/install_additional_ruby.sh b/test-scenarios/install_additional_ruby.sh
deleted file mode 100644
index 3e76159..0000000
--- a/test-scenarios/install_additional_ruby.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "ruby version 3.1.2 installed as default" ruby -v | grep 3.1.2
-check "ruby version 2.5.9 installed"  rvm list | grep 2.5.9
-check "ruby version 3.0.4 installed"  rvm list | grep 3.0.4
-
-# Report result
-reportResults
diff --git a/test-scenarios/install_cudnn_nvxt.sh b/test-scenarios/install_cudnn_nvxt.sh
deleted file mode 100644
index 7b20f43..0000000
--- a/test-scenarios/install_cudnn_nvxt.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-# Check installation of libcudnn8
-check "libcudnn.so.8" test 1 -eq "$(find /usr -name 'libcudnn.so.8' | wc -l)"
-
-# Check installation of cuda-nvtx-11-<version>
-check "cuda-11+nvtx" test -e '/usr/local/cuda-11/targets/x86_64-linux/include/nvtx3'
-
-# Report result
-reportResults
diff --git a/test-scenarios/install_cudnn_nvxt_version.sh b/test-scenarios/install_cudnn_nvxt_version.sh
deleted file mode 100644
index a7f46bd..0000000
--- a/test-scenarios/install_cudnn_nvxt_version.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-# Check installation of libcudnn8 (8.3.2)
-check "libcudnn.so.8.3.2" test 1 -eq "$(find /usr -name 'libcudnn.so.8.3.2' | wc -l)"
-
-# Check installation of cuda-nvtx-11-5 (11.5)
-check "cuda-11-5+nvtx" test -e '/usr/local/cuda-11.5/targets/x86_64-linux/include/nvtx3'
-
-# Report result
-reportResults
-    
\ No newline at end of file
diff --git a/test-scenarios/install_dotnet_3.sh b/test-scenarios/install_dotnet_3.sh
deleted file mode 100644
index 0d05215..0000000
--- a/test-scenarios/install_dotnet_3.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "dotnet sdks" dotnet --list-sdks
-check "some major version of dotnet 3 is installed" dotnet --list-sdks |  grep '3\.[0-9]*\.[0-9]*'
-check "dotnet version 3 installed"  ls -l /usr/share/dotnet/sdk | grep '3\.[0-9]*\.[0-9]*'
-
-# Report result
-reportResults
diff --git a/test-scenarios/install_dotnet_5.sh b/test-scenarios/install_dotnet_5.sh
deleted file mode 100644
index 5f48eb1..0000000
--- a/test-scenarios/install_dotnet_5.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "dotnet sdks" dotnet --list-sdks
-check "some major version of dotnet 5 is installed" dotnet --list-sdks |  grep '5\.[0-9]*\.[0-9]*'
-check "dotnet version 5 installed"  ls -l /usr/share/dotnet/sdk | grep '5\.[0-9]*\.[0-9]*'
-
-
-# Report result
-reportResults
diff --git a/test-scenarios/install_gradle_and_maven.sh b/test-scenarios/install_gradle_and_maven.sh
deleted file mode 100644
index a81dd9e..0000000
--- a/test-scenarios/install_gradle_and_maven.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "java" java --version
-check "gradle" gradle --version
-check "maven" mvn --version
-
-# Report result
-reportResults
diff --git a/test-scenarios/install_jupyterlab.sh b/test-scenarios/install_jupyterlab.sh
deleted file mode 100644
index 9c5e453..0000000
--- a/test-scenarios/install_jupyterlab.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "version" jupyter lab --version
-check "config" grep ".*.allow_origin = '*'" /home/vscode/.jupyter/jupyter_notebook_config.py
-
-check "user" whoami | grep vscode
-check "zsh" zsh --version
-check "wget" wget -V
-
-# Report result
-reportResults
diff --git a/test-scenarios/install_os_provided_python.sh b/test-scenarios/install_os_provided_python.sh
deleted file mode 100644
index 4dba59d..0000000
--- a/test-scenarios/install_os_provided_python.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "python3 is installed" python3 --version
-check "python is installed" python --version
-check "pip is installed" pip --version
-check "pip is installed" pip3 --version
-
-check "node is installed" node --version
-
-# Report result
-reportResults
diff --git a/test-scenarios/install_python_twice.sh b/test-scenarios/install_python_twice.sh
deleted file mode 100644
index 911ee54..0000000
--- a/test-scenarios/install_python_twice.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "version 3.9 installed"  ls -1 /usr/local/python/ | grep 3.9
-check "version 3.8 installed"  ls -1 /usr/local/python/ | grep 3.8
-
-check "3.9 alias to python on path" python  --version | grep 3.9
-
-# Report result
-reportResults
diff --git a/test-scenarios/rust_at_pinned_version.sh b/test-scenarios/rust_at_pinned_version.sh
deleted file mode 100644
index 2954a7a..0000000
--- a/test-scenarios/rust_at_pinned_version.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-# Definition specific tests
-check "cargo version" cargo  --version
-check "rustc version" rustc  --version
-check "correct rust version" rustc  --version | grep 1.62.0
-
-
-# Report result
-reportResults
\ No newline at end of file
diff --git a/test-scenarios/scenarios.json b/test-scenarios/scenarios.json
deleted file mode 100644
index ddf15d0..0000000
--- a/test-scenarios/scenarios.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-    "install_os_provided_python": {
-        "image": "mcr.microsoft.com/devcontainers/base:0-bullseye",
-        "features": {
-            "node": "latest",
-            "python": "os-provided"
-        }
-    },
-    "install_gradle_and_maven": {
-        "image": "ubuntu:focal",
-        "features": {
-            "java": {
-                "version": "latest",
-                "installGradle": true,
-                "installMaven": true
-            }
-        }
-    },
-    "install_additional_php": {
-        "image": "ubuntu:focal",
-        "features": {
-            "php": {
-                "version": "8.1.4",
-                "additionalVersions": "8.0.17,8.0.3"
-            }
-        }
-    },
-    "install_additional_java": {
-        "image": "ubuntu:focal",
-        "features": {
-            "java": {
-                "version": "17",
-                "additionalVersions": "11,8"
-            }
-        }
-    },
-    "install_jupyterlab": {
-        "image": "mcr.microsoft.com/devcontainers/base:focal",
-        "remoteUser": "vscode",
-        "features": {
-            "common-utils": {
-                "username": "vscode"
-            },
-            "python": {
-                "installJupyterlab": true,
-                "configureJupyterlabAllowOrigin": "*"
-            }
-        }
-    },
-    "install_additional_node": {
-        "image": "debian:11",
-        "features": {
-            "node": {
-                "version": "latest",
-                "additionalVersions": "v17.9.1,v14.19.3"
-            }
-        }
-    },
-    "install_additional_python": {
-        "image": "ubuntu:focal",
-        "features": {
-            "python": {
-                "version": "3.10.5",
-                "additionalVersions": "3.8,3.9.13"
-            }
-        }
-    },
-    "install_additional_ruby": {
-        "image": "ubuntu:focal",
-        "features": {
-            "ruby": {
-                "version": "3.1.2",
-                "additionalVersions": "2.5,3.0.4"
-            }
-        }
-    },
-    "install_additional_dotnet": {
-        "image": "ubuntu:focal",
-        "features": {
-            "dotnet": {
-                "version": "6.0.301",
-                "additionalVersions": "5.0,3.1.420"
-            }
-        }
-    },
-    "install_dotnet_5": {
-        "image": "ubuntu:focal",
-        "features": {
-            "dotnet": {
-                "version": "5"
-            }
-        }
-    },
-    "install_dotnet_3": {
-        "image": "ubuntu:focal",
-        "features": {
-            "dotnet": {
-                "version": "3"
-            }
-        }
-    },
-    "rust_at_pinned_version": {
-        "image": "ubuntu:focal",
-        "features": {
-            "rust": {
-                "version": "1.62.0"
-            }
-        }
-    },
-    "install_cudnn_nvxt": {
-        "image": "debian",
-        "features": {
-            "nvidia-cuda": {
-                "installCudnn": true,
-                "installNvtx": true
-            }
-        }
-    },
-    "install_cudnn_nvxt_version": {
-        "image": "debian",
-        "features": {
-            "nvidia-cuda": {
-                "installCudnn": true,
-                "installNvtx": true,
-                "cudaVersion": "11.5",
-                "cudnnVersion": "8.3.2.44"
-            }
-        }
-    }
-}
\ No newline at end of file