add tests

Author: culhatsker

generate.py

@@ -22,6 +22,7 @@
 parser.add_argument("-o", "--out", "--output", default="Dockerfile",
     help="output file name to write Dockerfile to, defaults to 'Dockerfile'")
 parser.add_argument("-j", action="store_true", help="Also output a json with information about the image.")
+parser.add_argument("--tests", action="store_true", help="Also generate test.sh that will run tests for the image")
 
 
 args = parser.parse_args()
@@ -37,11 +38,11 @@
     context = config.default_env.load(args.config)
 else:
     package_info = package_filename.parse(args.package_url.rsplit("/", 1)[-1])
-    package_version = package_info.get("version")
-    package_version_extra = package_info.get("version_extra")
-    if args.wheels_url and package_version and package_version_extra:
-        # concatenating without the last part
-        package_version += "." + package_version_extra.rsplit(".", 1)[0]
+    package_version = package_info["version"]
+    wheels_version = package_version
+    if args.wheels_url:
+        # this is a pre-release then add extra version
+        package_version += "." + package_info["version_extra"]
     config_data = {
         "_based_on": package_info["os"],
         "_template": "Dockerfile_default.j2",
@@ -50,7 +51,7 @@
             "version": package_version,
             "wheels": {
                 "url": args.wheels_url,
-                # "version": None
+                "version": wheels_version
             }
         }
     }
@@ -72,13 +73,31 @@
 with open(args.out, "w") as outfile:
     outfile.write(dockerfile)
 
+image_name = f"{context['os_id']}_{args.preset}:{context['package']['version']}"
+
 if args.j:
     with open("image_data.json", "w") as file:
         json.dump({
-            "image_name": f"{context['os_id']}_{args.preset}:{context['package']['version']}",
+            "image_name": image_name,
             "base_image": context["base_image"],
             "product_version": context["package"]["version"],
             "wheels_version": None,
             "distribution": args.preset,
             "os": context["os_id"]
         }, file)
+
+if args.tests:
+    testfile = open("test.sh", "w")
+    testfile.write("set -e\n")
+    testfile.write(f"IMAGE_NAME={image_name}\n")
+    testfile.write("TESTS_VOLUME=./refactor/tests/in_container:/tests\n")
+    testfile.write('crun() { docker run --rm -it -v $TESTS_VOLUME $IMAGE_NAME bash -c "$1"; }\n')
+    testfile.write('run_test() { echo TEST $1 $2; crun "/tests/$1 $2 2>&1 >/dev/null && echo SUCCESS || echo ERROR"; }\n')
+    testfile.write("docker build -t $IMAGE_NAME .\n")
+    for test in context["tests"]:
+        arg = None
+        try:
+            test, arg = test.split("@", 1)
+        except ValueError:
+            pass
+        testfile.write(f"run_test {test} {arg}\n")

refactor/tests/test_configs.py

@@ -0,0 +1,33 @@
+import pytest
+import json
+import os
+
+from urllib.request import Request, urlopen
+
+
+def parametrize_configs(path):
+    to_scan = [path]
+    while to_scan:
+        for item in os.scandir(to_scan.pop()):
+            if item.is_dir():
+                to_scan.append(item.path)
+                continue
+            if item.name.endswith(".json"):
+                yield item.path
+
+
+@pytest.mark.parametrize('path', parametrize_configs("configs"))
+def test_valid_json(path):
+    json.load(open(path))
+
+
+@pytest.mark.parametrize('path', parametrize_configs("configs/releases"))
+def test_package_url_exists(path):
+    data = json.load(open(path))
+    package = data.get("package")
+    if not package:
+        pytest.skip("no package defined")
+    package_url = package.get("url")
+    if not package_url:
+        raise Exception("package defined, but no url")
+    urlopen(Request(package_url, method="HEAD"))

refactor/tests/test_imagepy.py renamed to refactor/tests/test_entrypoint.py

@@ -17,7 +17,7 @@ def test_runs_without_virtualenv():
     if "VIRTUAL_ENV" in environ:
         del environ["VIRTUAL_ENV"]
     subprocess.check_call(
-        args=[os.path.realpath(sys.executable), "image.py", "--help"],
+        args=[os.path.realpath(sys.executable), "generate.py", "--help"],
         env=environ
     )
 
@@ -56,22 +56,3 @@ def parametrize_config_preset():
 def test_dockerfile_generate(config, preset, temp_file):
     dockerfile = temp_file("Dockerfile")
     subprocess.check_call([sys.executable, "image.py", config, "-p", preset, "-o", dockerfile])
-
-
-@pytest.mark.parametrize('config,preset', parametrize_config_preset())
-def test_dockerfile_build_internal(config, preset, temp_file):
-    dockerfile = temp_file("Dockerfile")
-    subprocess.check_call([sys.executable, "image.py", config, "-p", preset, "-o", dockerfile, "--build"])
-
-
-@pytest.mark.parametrize('config,preset', parametrize_config_preset())
-def test_dockerfile_build_manually(config, preset, temp_file):
-    dockerfile = temp_file("Dockerfile")
-    subprocess.check_call([sys.executable, "image.py", config, "-p", preset, "-o", dockerfile])
-    subprocess.check_call(["docker", "build", "-f", dockerfile])
-
-
-@pytest.mark.parametrize('config,preset', parametrize_config_preset())
-def test_dockerfile_test_internal(config, preset, temp_file):
-    dockerfile = temp_file("Dockerfile")
-    subprocess.check_call([sys.executable, "image.py", config, "-p", preset, "-o", dockerfile, "--build", "--test"])

refactor/tests/test_oldentrypoint.py

@@ -55,7 +55,7 @@ RUN mkdir -p $INTEL_OPENVINO_DIR && \
     chmod a=rwx $INTEL_OPENVINO_DIR && \
     cd $INTEL_OPENVINO_DIR && \
     curl "{{ package.url }}" \
-    | tar -xz --strip-components=1
+    | tar -xz --strip-components=1 --no-same-owner --owner=openvino --group=openvino
 
 # Package env setup
 ENV PKG_CONFIG_PATH=$INTEL_OPENVINO_DIR/runtime/lib/intel64/pkgconfig