Skip to content

Commit 9666758

Browse files
committed
Improve GitHub actions workflow
1 parent 3990072 commit 9666758

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

.github/workflows/workflows.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ jobs:
3434
- name: Setup Minikube
3535
uses: manusa/actions-setup-minikube@v2.7.2
3636
with:
37-
minikube version: 'v1.28.0'
37+
minikube version: 'v1.30.1'
3838
kubernetes version: ${{ matrix.kubernetes }}
3939
github token: ${{ secrets.GITHUB_TOKEN }}
40+
container runtime: containerd
41+
driver: docker
4042
- name: Setup Docker
4143
run: sudo apt-get -qq -y install conntrack socat ; nohup socat TCP-LISTEN:2375,reuseaddr,fork UNIX-CONNECT:/var/run/docker.sock &
4244
- name: Setup Docker Swarm
@@ -54,7 +56,7 @@ jobs:
5456
docker ps -a
5557
kubectl get pod -A
5658
- name: Run Tests
57-
run: mvn -B test
59+
run: mvn -B test
5860

5961
dependency:
6062
runs-on: ubuntu-latest

src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerEngineBackend.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ public List<ExistingContainerInfo> scanExistingContainers() throws Exception {
202202

203203
for (com.spotify.docker.client.messages.Container container: dockerClient.listContainers(ListContainersParam.allContainers())) {
204204
if (!container.state().equalsIgnoreCase("running")) {
205+
log.warn("Ignoring container {} because it is not running, {}", container.id(), container.state());
205206
continue; // not recovering stopped/broken apps
206207
}
207208

src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnSwarm.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ private boolean checkEverythingCleanedUp() throws DockerCertificateException, Do
7272

7373
@AfterEach
7474
public void waitForCleanup() throws InterruptedException, DockerException, DockerCertificateException {
75+
Thread.sleep(3_000); // wait before checking
7576
for (int i = 0; i < 120; i++) {
7677
if (checkEverythingCleanedUp()) {
7778
break;

0 commit comments

Comments
 (0)