From 105646245b06cc591c77f087c4d9d281c5209e12 Mon Sep 17 00:00:00 2001 From: Daniela Plascencia Date: Thu, 6 Jun 2024 12:40:39 +0200 Subject: [PATCH 1/3] chore: replace ROCKs with rocks This commit replaces ROCKs with rocks to be in sync with Canonical's standard terminology. Part of canonical/bundle-kubeflow#916 --- .github/workflows/on_pull_request.yaml | 2 +- .github/workflows/on_push.yaml | 2 +- CONTRIBUTING.md | 6 +++--- README.md | 2 +- agent/tests/test_rock.py | 6 +++--- agent/tox.ini | 6 +++--- controller/tests/test_rock.py | 6 +++--- controller/tox.ini | 6 +++--- lgbserver/tests/test_rock.py | 8 ++++---- lgbserver/tox.ini | 6 +++--- paddleserver/tests/test_rock.py | 8 ++++---- paddleserver/tox.ini | 6 +++--- pmmlserver/tests/test_rock.py | 8 ++++---- pmmlserver/tox.ini | 6 +++--- sklearnserver/tests/test_rock.py | 8 ++++---- sklearnserver/tox.ini | 6 +++--- storage-initializer/tests/test_rock.py | 8 ++++---- storage-initializer/tox.ini | 6 +++--- xgbserver/tests/test_rock.py | 8 ++++---- xgbserver/tox.ini | 6 +++--- 20 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.github/workflows/on_pull_request.yaml b/.github/workflows/on_pull_request.yaml index 7d1c4a6..66e1ff6 100644 --- a/.github/workflows/on_pull_request.yaml +++ b/.github/workflows/on_pull_request.yaml @@ -6,7 +6,7 @@ on: jobs: on-pull-request: - name: Get ROCKs modified and build-scan-test them + name: Get rocks modified and build-scan-test them uses: canonical/charmed-kubeflow-workflows/.github/workflows/get-rocks-modified-and-build-scan-test-publish.yaml@main permissions: pull-requests: read diff --git a/.github/workflows/on_push.yaml b/.github/workflows/on_push.yaml index 1cfd1ec..1236fc2 100644 --- a/.github/workflows/on_push.yaml +++ b/.github/workflows/on_push.yaml @@ -9,7 +9,7 @@ on: jobs: on-push: - name: Get ROCKs modified and build-scan-test-publish them + name: Get rocks modified and build-scan-test-publish them uses: canonical/charmed-kubeflow-workflows/.github/workflows/get-rocks-modified-and-build-scan-test-publish.yaml@main permissions: pull-requests: read diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8062665..2ac9345 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,9 +10,9 @@ The KServe server images are a collection of different inference server runtimes The Dockerfile for each of these images takes advantage of how each server is defined as a poetry package, using `poetry install` in the Dockerfile directly. -## Implementation details of the ROCKs in this repo +## Implementation details of the rocks in this repo -The ROCKs for the KServe servers require some atypical workarounds, mostly due to the upstream project using poetry to install its dependencies. These are documented here in detail, and briefly noted in the rockcraft.yaml files in this repository. +The rocks for the KServe servers require some atypical workarounds, mostly due to the upstream project using poetry to install its dependencies. These are documented here in detail, and briefly noted in the rockcraft.yaml files in this repository. ### Installing Python/pip via overlay-packages @@ -70,4 +70,4 @@ The upstream install procedure results in `python` being executable, but our roc ## Integration testing the server images -For every inference server provided, upstream maintains an example usage in their [Model Serving Runtimes docs](https://kserve.github.io/website/master/modelserving/v1beta1/serving_runtime/). Each example includes a model for the given server, sample input, and an example `curl` call. These can be used for integration testing of the models without deploying KServe. See also the `README.md` files in the subdirs of this repo for some of these examples applied to our ROCKs. +For every inference server provided, upstream maintains an example usage in their [Model Serving Runtimes docs](https://kserve.github.io/website/master/modelserving/v1beta1/serving_runtime/). Each example includes a model for the given server, sample input, and an example `curl` call. These can be used for integration testing of the models without deploying KServe. See also the `README.md` files in the subdirs of this repo for some of these examples applied to our rocks. diff --git a/README.md b/README.md index 293e0e2..8fd3699 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # kserve-rocks -ROCKs for Kserve +rocks for Kserve diff --git a/agent/tests/test_rock.py b/agent/tests/test_rock.py index 3221fd0..e9d86b7 100644 --- a/agent/tests/test_rock.py +++ b/agent/tests/test_rock.py @@ -13,7 +13,7 @@ def test_rock(): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" # assert the rock contains the expected files subprocess.run( @@ -21,7 +21,7 @@ def test_rock(): "docker", "run", "--rm", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "exec", "ls", "-la", @@ -35,7 +35,7 @@ def test_rock(): "docker", "run", "--rm", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "exec", "ls", "-la", diff --git a/agent/tox.ini b/agent/tox.ini index 3c73eb2..9ee8100 100644 --- a/agent/tox.ini +++ b/agent/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' + echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * diff --git a/controller/tests/test_rock.py b/controller/tests/test_rock.py index 30bc0d1..e75e250 100644 --- a/controller/tests/test_rock.py +++ b/controller/tests/test_rock.py @@ -13,7 +13,7 @@ def test_rock(): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" # assert the rock contains the expected files subprocess.run( @@ -21,7 +21,7 @@ def test_rock(): "docker", "run", "--rm", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "exec", "ls", "-la", @@ -31,6 +31,6 @@ def test_rock(): ) subprocess.run( - ["docker", "run", "--rm", LOCAL_ROCK_IMAGE, "exec", "ls", "-la", "/manager"], + ["docker", "run", "--rm", LOCAL_rock_IMAGE, "exec", "ls", "-la", "/manager"], check=True, ) diff --git a/controller/tox.ini b/controller/tox.ini index 3c73eb2..9ee8100 100644 --- a/controller/tox.ini +++ b/controller/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' + echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * diff --git a/lgbserver/tests/test_rock.py b/lgbserver/tests/test_rock.py index 77aed84..5f88230 100644 --- a/lgbserver/tests/test_rock.py +++ b/lgbserver/tests/test_rock.py @@ -31,7 +31,7 @@ def test_rock(rock_test_env): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" # assert we have the expected files subprocess.run( @@ -40,7 +40,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/lgbserver", ], @@ -52,7 +52,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/kserve", ], @@ -64,7 +64,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /third_party", ], diff --git a/lgbserver/tox.ini b/lgbserver/tox.ini index de23c73..891fa0d 100644 --- a/lgbserver/tox.ini +++ b/lgbserver/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' + echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * diff --git a/paddleserver/tests/test_rock.py b/paddleserver/tests/test_rock.py index c08bb79..36e5c49 100644 --- a/paddleserver/tests/test_rock.py +++ b/paddleserver/tests/test_rock.py @@ -36,7 +36,7 @@ def test_rock(rock_test_env): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" # assert we have the expected files subprocess.run( @@ -45,7 +45,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/paddleserver", ], @@ -57,7 +57,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/kserve", ], @@ -69,7 +69,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /third_party", ], diff --git a/paddleserver/tox.ini b/paddleserver/tox.ini index de23c73..891fa0d 100644 --- a/paddleserver/tox.ini +++ b/paddleserver/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' + echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * diff --git a/pmmlserver/tests/test_rock.py b/pmmlserver/tests/test_rock.py index 9fa4686..614f557 100644 --- a/pmmlserver/tests/test_rock.py +++ b/pmmlserver/tests/test_rock.py @@ -36,7 +36,7 @@ def test_rock(rock_test_env): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" # assert we have the expected files subprocess.run( @@ -45,7 +45,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/pmmlserver", ], @@ -57,7 +57,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/kserve", ], @@ -69,7 +69,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /third_party", ], diff --git a/pmmlserver/tox.ini b/pmmlserver/tox.ini index de23c73..891fa0d 100644 --- a/pmmlserver/tox.ini +++ b/pmmlserver/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' + echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * diff --git a/sklearnserver/tests/test_rock.py b/sklearnserver/tests/test_rock.py index de84d53..a0ea059 100644 --- a/sklearnserver/tests/test_rock.py +++ b/sklearnserver/tests/test_rock.py @@ -36,7 +36,7 @@ def test_rock(rock_test_env): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" # assert we have the expected files subprocess.run( @@ -45,7 +45,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/sklearnserver", ], @@ -57,7 +57,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/kserve", ], @@ -69,7 +69,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /third_party", ], diff --git a/sklearnserver/tox.ini b/sklearnserver/tox.ini index de23c73..891fa0d 100644 --- a/sklearnserver/tox.ini +++ b/sklearnserver/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' + echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * diff --git a/storage-initializer/tests/test_rock.py b/storage-initializer/tests/test_rock.py index 6a62c14..ebc7fcb 100644 --- a/storage-initializer/tests/test_rock.py +++ b/storage-initializer/tests/test_rock.py @@ -31,7 +31,7 @@ def test_rock(rock_test_env): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" # assert we have the expected files subprocess.run( @@ -40,7 +40,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/kserve", ], @@ -52,7 +52,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /third_party", ], @@ -64,7 +64,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /storage-initializer/scripts/initializer-entrypoint", ], diff --git a/storage-initializer/tox.ini b/storage-initializer/tox.ini index de23c73..891fa0d 100644 --- a/storage-initializer/tox.ini +++ b/storage-initializer/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' + echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * diff --git a/xgbserver/tests/test_rock.py b/xgbserver/tests/test_rock.py index caa84a2..3bda547 100644 --- a/xgbserver/tests/test_rock.py +++ b/xgbserver/tests/test_rock.py @@ -36,7 +36,7 @@ def test_rock(rock_test_env): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" # assert we have the expected files subprocess.run( @@ -45,7 +45,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/xgbserver", ], @@ -57,7 +57,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/kserve", ], @@ -69,7 +69,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_ROCK_IMAGE, + LOCAL_rock_IMAGE, "-c", "ls -la /third_party", ], diff --git a/xgbserver/tox.ini b/xgbserver/tox.ini index de23c73..891fa0d 100644 --- a/xgbserver/tox.ini +++ b/xgbserver/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' + echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * From 08c8843a00c0402e2eb9a2df56dd38f9a2648d88 Mon Sep 17 00:00:00 2001 From: Daniela Plascencia Date: Fri, 7 Jun 2024 16:41:13 +0200 Subject: [PATCH 2/3] skip: fix env var --- agent/tests/test_rock.py | 6 +++--- controller/tests/test_rock.py | 6 +++--- lgbserver/tests/test_rock.py | 8 ++++---- paddleserver/tests/test_rock.py | 8 ++++---- pmmlserver/tests/test_rock.py | 8 ++++---- sklearnserver/tests/test_rock.py | 8 ++++---- storage-initializer/tests/test_rock.py | 8 ++++---- xgbserver/tests/test_rock.py | 8 ++++---- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/agent/tests/test_rock.py b/agent/tests/test_rock.py index e9d86b7..3221fd0 100644 --- a/agent/tests/test_rock.py +++ b/agent/tests/test_rock.py @@ -13,7 +13,7 @@ def test_rock(): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" # assert the rock contains the expected files subprocess.run( @@ -21,7 +21,7 @@ def test_rock(): "docker", "run", "--rm", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "exec", "ls", "-la", @@ -35,7 +35,7 @@ def test_rock(): "docker", "run", "--rm", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "exec", "ls", "-la", diff --git a/controller/tests/test_rock.py b/controller/tests/test_rock.py index e75e250..30bc0d1 100644 --- a/controller/tests/test_rock.py +++ b/controller/tests/test_rock.py @@ -13,7 +13,7 @@ def test_rock(): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" # assert the rock contains the expected files subprocess.run( @@ -21,7 +21,7 @@ def test_rock(): "docker", "run", "--rm", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "exec", "ls", "-la", @@ -31,6 +31,6 @@ def test_rock(): ) subprocess.run( - ["docker", "run", "--rm", LOCAL_rock_IMAGE, "exec", "ls", "-la", "/manager"], + ["docker", "run", "--rm", LOCAL_ROCK_IMAGE, "exec", "ls", "-la", "/manager"], check=True, ) diff --git a/lgbserver/tests/test_rock.py b/lgbserver/tests/test_rock.py index 5f88230..77aed84 100644 --- a/lgbserver/tests/test_rock.py +++ b/lgbserver/tests/test_rock.py @@ -31,7 +31,7 @@ def test_rock(rock_test_env): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" # assert we have the expected files subprocess.run( @@ -40,7 +40,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/lgbserver", ], @@ -52,7 +52,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/kserve", ], @@ -64,7 +64,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /third_party", ], diff --git a/paddleserver/tests/test_rock.py b/paddleserver/tests/test_rock.py index 36e5c49..c08bb79 100644 --- a/paddleserver/tests/test_rock.py +++ b/paddleserver/tests/test_rock.py @@ -36,7 +36,7 @@ def test_rock(rock_test_env): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" # assert we have the expected files subprocess.run( @@ -45,7 +45,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/paddleserver", ], @@ -57,7 +57,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/kserve", ], @@ -69,7 +69,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /third_party", ], diff --git a/pmmlserver/tests/test_rock.py b/pmmlserver/tests/test_rock.py index 614f557..9fa4686 100644 --- a/pmmlserver/tests/test_rock.py +++ b/pmmlserver/tests/test_rock.py @@ -36,7 +36,7 @@ def test_rock(rock_test_env): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" # assert we have the expected files subprocess.run( @@ -45,7 +45,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/pmmlserver", ], @@ -57,7 +57,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/kserve", ], @@ -69,7 +69,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /third_party", ], diff --git a/sklearnserver/tests/test_rock.py b/sklearnserver/tests/test_rock.py index a0ea059..de84d53 100644 --- a/sklearnserver/tests/test_rock.py +++ b/sklearnserver/tests/test_rock.py @@ -36,7 +36,7 @@ def test_rock(rock_test_env): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" # assert we have the expected files subprocess.run( @@ -45,7 +45,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/sklearnserver", ], @@ -57,7 +57,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/kserve", ], @@ -69,7 +69,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /third_party", ], diff --git a/storage-initializer/tests/test_rock.py b/storage-initializer/tests/test_rock.py index ebc7fcb..6a62c14 100644 --- a/storage-initializer/tests/test_rock.py +++ b/storage-initializer/tests/test_rock.py @@ -31,7 +31,7 @@ def test_rock(rock_test_env): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" # assert we have the expected files subprocess.run( @@ -40,7 +40,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/kserve", ], @@ -52,7 +52,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /third_party", ], @@ -64,7 +64,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /storage-initializer/scripts/initializer-entrypoint", ], diff --git a/xgbserver/tests/test_rock.py b/xgbserver/tests/test_rock.py index 3bda547..caa84a2 100644 --- a/xgbserver/tests/test_rock.py +++ b/xgbserver/tests/test_rock.py @@ -36,7 +36,7 @@ def test_rock(rock_test_env): check_rock = CheckRock("rockcraft.yaml") rock_image = check_rock.get_name() rock_version = check_rock.get_version() - LOCAL_rock_IMAGE = f"{rock_image}:{rock_version}" + LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}" # assert we have the expected files subprocess.run( @@ -45,7 +45,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/xgbserver", ], @@ -57,7 +57,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /usr/local/lib/python3.10/dist-packages/kserve", ], @@ -69,7 +69,7 @@ def test_rock(rock_test_env): "run", "--entrypoint", "/bin/bash", - LOCAL_rock_IMAGE, + LOCAL_ROCK_IMAGE, "-c", "ls -la /third_party", ], From 21c120f34a0ed0d7a1f03eeeb6607cf85f47b767 Mon Sep 17 00:00:00 2001 From: Daniela Plascencia Date: Tue, 11 Jun 2024 15:14:38 +0200 Subject: [PATCH 3/3] skip: fix env var --- agent/tox.ini | 6 +++--- controller/tox.ini | 6 +++--- lgbserver/tox.ini | 8 ++++---- paddleserver/tox.ini | 8 ++++---- pmmlserver/tox.ini | 8 ++++---- sklearnserver/tox.ini | 8 ++++---- storage-initializer/tox.ini | 8 ++++---- xgbserver/tox.ini | 8 ++++---- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/agent/tox.ini b/agent/tox.ini index 9ee8100..3c73eb2 100644 --- a/agent/tox.ini +++ b/agent/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' + echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * diff --git a/controller/tox.ini b/controller/tox.ini index 9ee8100..3c73eb2 100644 --- a/controller/tox.ini +++ b/controller/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' + echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * diff --git a/lgbserver/tox.ini b/lgbserver/tox.ini index 891fa0d..98c7168 100644 --- a/lgbserver/tox.ini +++ b/lgbserver/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' + echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * @@ -51,4 +51,4 @@ allowlist_externals = echo commands = # TODO: Implement integration tests here - echo "WARNING: This is a placeholder test - no test is implemented here." \ No newline at end of file + echo "WARNING: This is a placeholder test - no test is implemented here." diff --git a/paddleserver/tox.ini b/paddleserver/tox.ini index 891fa0d..98c7168 100644 --- a/paddleserver/tox.ini +++ b/paddleserver/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' + echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * @@ -51,4 +51,4 @@ allowlist_externals = echo commands = # TODO: Implement integration tests here - echo "WARNING: This is a placeholder test - no test is implemented here." \ No newline at end of file + echo "WARNING: This is a placeholder test - no test is implemented here." diff --git a/pmmlserver/tox.ini b/pmmlserver/tox.ini index 891fa0d..98c7168 100644 --- a/pmmlserver/tox.ini +++ b/pmmlserver/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' + echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * @@ -51,4 +51,4 @@ allowlist_externals = echo commands = # TODO: Implement integration tests here - echo "WARNING: This is a placeholder test - no test is implemented here." \ No newline at end of file + echo "WARNING: This is a placeholder test - no test is implemented here." diff --git a/sklearnserver/tox.ini b/sklearnserver/tox.ini index 891fa0d..98c7168 100644 --- a/sklearnserver/tox.ini +++ b/sklearnserver/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' + echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * @@ -51,4 +51,4 @@ allowlist_externals = echo commands = # TODO: Implement integration tests here - echo "WARNING: This is a placeholder test - no test is implemented here." \ No newline at end of file + echo "WARNING: This is a placeholder test - no test is implemented here." diff --git a/storage-initializer/tox.ini b/storage-initializer/tox.ini index 891fa0d..98c7168 100644 --- a/storage-initializer/tox.ini +++ b/storage-initializer/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' + echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * @@ -51,4 +51,4 @@ allowlist_externals = echo commands = # TODO: Implement integration tests here - echo "WARNING: This is a placeholder test - no test is implemented here." \ No newline at end of file + echo "WARNING: This is a placeholder test - no test is implemented here." diff --git a/xgbserver/tox.ini b/xgbserver/tox.ini index 891fa0d..98c7168 100644 --- a/xgbserver/tox.ini +++ b/xgbserver/tox.ini @@ -31,10 +31,10 @@ commands = bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \ VERSION=$(yq eval .version rockcraft.yaml) && \ ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \ - rock="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ + ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \ DOCKER_IMAGE=$NAME:$VERSION && \ - echo "Exporting $rock to docker as $DOCKER_IMAGE" && \ - skopeo --insecure-policy copy oci-archive:$rock docker-daemon:$DOCKER_IMAGE' + echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \ + skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE' [testenv:sanity] passenv = * @@ -51,4 +51,4 @@ allowlist_externals = echo commands = # TODO: Implement integration tests here - echo "WARNING: This is a placeholder test - no test is implemented here." \ No newline at end of file + echo "WARNING: This is a placeholder test - no test is implemented here."