Fix CI (#329)

Author: zubenkoivan

.github/workflows/ci.yaml

@@ -3,26 +3,21 @@ name: CI
 on:
   push:
     branches: [master]
-    tags: [v*.*, v*.*.*]
+    tags: [v*]
   pull_request:
     branches: [master]
-  pull_request_target:
-    branches: [master]
   schedule:
   - cron: 0 4 * * *
 
 jobs:
   test:
     name: Run tests
     runs-on: ubuntu-latest
-    if: |
-      (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') ||
-      (github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]')
     steps:
     - name: Checkout commit
       uses: actions/checkout@v2
     - name: Install python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Cache packages

.github/workflows/setup-automerge.yml

@@ -1,6 +1,6 @@
 name: Enable auto-merge
 on:
-  pull_request_target:
+  pull_request:
     types: [opened]
 
 permissions:

Makefile

@@ -1,8 +1,5 @@
 GOPATH ?= $(HOME)/go
 
-WAIT_FOR_IT_URL = https://raw.githubusercontent.com/eficode/wait-for/master/wait-for
-WAIT_FOR_IT = curl -s $(WAIT_FOR_IT_URL) | bash -s --
-
 setup:
 	pip install -U pip
 	pip install -e .[build-tools]
@@ -25,15 +22,8 @@ test_unit:
 
 test_integration: minikube_image_load
 	echo tests/integration/k8s/* | xargs -n 1 kubectl --context minikube apply -f
-
-	export CRI_ADDRESS=$$(minikube service cri --url | sed -e "s/^http:\/\///"); \
-	$(WAIT_FOR_IT) $$CRI_ADDRESS -- echo "cri is up"
-	export RUNTIME_ADDRESS=$$(minikube service runtime --url | sed -e "s/^http:\/\///"); \
-	$(WAIT_FOR_IT) $$RUNTIME_ADDRESS -- echo "runtime is up"
-	export REGISTRY_ADDRESS=$$(minikube service registry --url | sed -e "s/^http:\/\///"); \
-	$(WAIT_FOR_IT) $$REGISTRY_ADDRESS -- echo "registry is up"
-	export SVC_ADDRESS=$$(minikube service platform-container-runtime --url | sed -e "s/^http:\/\///"); \
-	$(WAIT_FOR_IT) $$SVC_ADDRESS -- echo "service is up"
+	kubectl --context minikube get po -o name | xargs -n 1 kubectl --context minikube wait --for=jsonpath='{.status.phase}'=Running
+	kubectl --context minikube get po
 
 	pytest -vv --cov=platform_container_runtime --cov-report xml:.coverage-integration.xml tests/integration
 

platform_container_runtime/registry_client.py

@@ -78,7 +78,7 @@ async def get_version(self, server: str, auth: Optional[Auth] = None) -> str:
         ) as resp:
             if resp.status == 404:
                 return "v1"
-            resp.raise_for_status()
+            await self._raise_for_status(resp)
             return "v2"
 
     async def check_blob(
@@ -90,7 +90,7 @@ async def check_blob(
         ) as resp:
             if resp.status == 404:
                 return False
-            resp.raise_for_status()
+            await self._raise_for_status(resp)
             return True
 
     async def start_blob_upload(
@@ -100,7 +100,7 @@ async def start_blob_upload(
         async with self._session.post(
             endpoints.blob_uploads(name), headers=self._get_auth_header(auth)
         ) as resp:
-            resp.raise_for_status()
+            await self._raise_for_status(resp)
             return URL(resp.headers[aiohttp.hdrs.LOCATION])
 
     async def upload_blob(
@@ -121,7 +121,7 @@ async def upload_blob(
             },
             data=data,
         ) as resp:
-            resp.raise_for_status()
+            await self._raise_for_status(resp)
 
     async def update_manifest(
         self,
@@ -141,4 +141,13 @@ async def update_manifest(
             },
             data=json.dumps(manifest),
         ) as resp:
-            resp.raise_for_status()
+            await self._raise_for_status(resp)
+
+    @classmethod
+    async def _raise_for_status(cls, response: aiohttp.ClientResponse) -> None:
+        try:
+            response.raise_for_status()
+        except aiohttp.ClientResponseError as exc:
+            content = await response.text()
+            exc.message += f"\n\n{content}"
+            raise exc

platform_container_runtime/service.py

@@ -178,6 +178,9 @@ async def exec(
         return Stream(self._streaming_client, url=url)
 
     async def kill(self, container_id: str, timeout_s: int = 0) -> None:
+        # NOTE: For Containerd the StopContainer RPC is idempotent, and doesn't
+        # raise an error if the container has already been stopped.
+        # For Docker it raises an error.
         await self._cri_client.stop_container(
             container_id=container_id,
             timeout_s=timeout_s,

setup.cfg

@@ -16,10 +16,9 @@ platforms = any
 include_package_data = True
 install_requires =
     aiohttp==3.8.5
-    yarl==1.9.2
     neuro-logging==21.12.2
-    grpcio==1.56.2
-    protobuf==4.21.12
+    grpcio==1.66.1
+    protobuf==5.27.2
     aiodocker==0.21.0
     docker-image-py==0.1.12
 
@@ -33,7 +32,7 @@ exclude =
 
 [options.extras_require]
 build-tools =
-    grpcio-tools==1.56.2
+    grpcio-tools==1.66.1
 dev =
     mypy==1.4.1
     mypy-protobuf==3.5.0

tests/integration/test_api.py

@@ -397,7 +397,10 @@ async def test_kill_unknown(
         self, api: ApiEndpoints, client: aiohttp.ClientSession
     ) -> None:
         async with client.post(api.kill("unknown")) as resp:
-            assert resp.status == HTTPNotFound.status_code, await resp.text()
+            assert resp.status in (
+                HTTPNoContent.status_code,
+                HTTPNotFound.status_code,
+            ), await resp.text()
 
     @pytest.mark.minikube
     async def test_commit(
@@ -563,4 +566,5 @@ async def test_commit_unknown_registry(
                     "no such host" in error
                     or "failure in name resolution" in error
                     or "Name or service not known" in error
+                    or "server misbehaving" in error
                 )