Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert release changes #8713

Merged
merged 3 commits into from
Apr 17, 2024
Merged

Revert release changes #8713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8129ea1
revert release changes
rasswanth-s Apr 17, 2024
4ea3646
modified to syft_base_worker_tag in 10-container-images notebook
rasswanth-s Apr 17, 2024
adfdead
Merge branch 'dev' into rasswanth/revert_release_changes
rasswanth-s Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/pr-tests-stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,11 @@ jobs:
run: |
pip install --upgrade tox tox-uv==1.5.1

# - name: Run syft backend base image building test
# if: steps.changes.outputs.stack == 'true'
# timeout-minutes: 60
# run: |
# tox -e backend.test.basecpu
- name: Run syft backend base image building test
if: steps.changes.outputs.stack == 'true'
timeout-minutes: 60
run: |
tox -e backend.test.basecpu

pr-tests-notebook-stack:
strategy:
Expand Down
12 changes: 6 additions & 6 deletions notebooks/api/0.8/10-container-images.ipynb
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be

syft_base_worker_tag = (
    "local-dev"
    if (bool(os.environ["DEV_MODE"]) and running_as_container)
    else sy.__version__
)
syft_base_worker_tag

as of commit 2c59b87, change was introduced with commit d2c0258

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in 4ea3646

Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@
"metadata": {},
"outputs": [],
"source": [
"custom_dockerfile_str = \"\"\"\n",
"FROM openmined/grid-backend:0.8.5-post.2\n",
"custom_dockerfile_str = f\"\"\"\n",
"FROM openmined/grid-backend:{syft_base_worker_tag}\n",
"\n",
"RUN pip install pydicom\n",
"\n",
Expand Down Expand Up @@ -1108,8 +1108,8 @@
"metadata": {},
"outputs": [],
"source": [
"custom_dockerfile_str_2 = \"\"\"\n",
"FROM openmined/grid-backend:0.8.5-post.2\n",
"custom_dockerfile_str_2 = f\"\"\"\n",
"FROM openmined/grid-backend:{syft_base_worker_tag}\n",
"\n",
"RUN pip install opendp\n",
"\"\"\".strip()\n",
Expand Down Expand Up @@ -1260,8 +1260,8 @@
"metadata": {},
"outputs": [],
"source": [
"custom_dockerfile_str_3 = \"\"\"\n",
"FROM openmined/grid-backend:0.8.5-post.2\n",
"custom_dockerfile_str_3 = f\"\"\"\n",
"FROM openmined/grid-backend:{syft_base_worker_tag}\n",
"\n",
"RUN pip install recordlinkage\n",
"\"\"\".strip()\n",
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/container_workload/pool_image_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def test_image_build(domain_1_port) -> None:
port=domain_1_port, email="info@openmined.org", password="changethis"
)

syft_base_tag = "0.8.5-post.2" # {sy.__version__}
syft_base_tag = sy.__version__

# Submit Docker Worker Config
docker_config_rl = f"""
Expand All @@ -38,7 +38,7 @@ def test_image_build(domain_1_port) -> None:
docker_config=docker_config
)
assert isinstance(submit_result, SyftSuccess)
# assert len(domain_client.images.get_all()) == 2
assert len(domain_client.images.get_all()) == 2

# Validate if we can get the worker image object from its config
workerimage = domain_client.api.services.worker_image.get_by_config(docker_config)
Expand Down Expand Up @@ -77,9 +77,9 @@ def test_pool_launch(domain_1_port) -> None:
domain_client: DomainClient = sy.login(
port=domain_1_port, email="info@openmined.org", password="changethis"
)
# assert len(domain_client.worker_pools.get_all()) == 1
assert len(domain_client.worker_pools.get_all()) == 1

syft_base_tag = "0.8.5-post.2" # {sy.__version__}
syft_base_tag = sy.__version__

# Submit Docker Worker Config
docker_config_opendp = f"""
Expand Down Expand Up @@ -119,7 +119,7 @@ def test_pool_launch(domain_1_port) -> None:
assert len(worker_pool_res) == 3

assert all(worker.error is None for worker in worker_pool_res)
# assert len(domain_client.worker_pools.get_all()) == 2
assert len(domain_client.worker_pools.get_all()) == 2

worker_pool = domain_client.worker_pools[worker_pool_name]
assert len(worker_pool.worker_list) == 3
Expand Down Expand Up @@ -181,7 +181,7 @@ def test_pool_image_creation_job_requests(domain_1_port) -> None:
assert isinstance(res, SyftSuccess)
ds_client = sy.login(email=ds_email, password="secret_pw", port=domain_1_port)

syft_base_tag = "0.8.5-post.2" # {sy.__version__}
syft_base_tag = sy.__version__

# the DS makes a request to create an image and a pool based on the image

Expand Down