Skip to content

Commit 6fb6cc2

Browse files
committed
Fix tests on Jenkins
1 parent d37adcf commit 6fb6cc2

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

JenkinsfileSCM

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ pipeline {
3030
sh 'echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories'
3131
sh 'apk add minikube@testing'
3232
sh 'docker network create sp-shared-network'
33+
// run swarm init, it forces the docker network to be correctly configured
34+
// without it the minikube pods cannot communicate
35+
sh 'docker swarm init'
3336
sh 'docker plugin install "grafana/loki-docker-driver:3.2.1" --alias loki --grant-all-permissions'
3437
sh 'adduser -D -u 1000 user && adduser user docker'
3538
sh "su user /bin/sh -c 'minikube start --driver=docker --force'"

src/test/resources/configs/conflict.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
kind: ConfigMap
33
metadata:
4-
name: sp-example-shinyproxy-cm-1e6e918b7c1346f00016ec33628704a71bbce6
4+
name: sp-example-shinyproxy-cm-236b447921ea65d98a0db289682f4ee3819d6f
55
namespace: itest
66
data:
77
application.yml: |

0 commit comments

Comments
 (0)