Commit 3327515 1 parent e709da5 commit 3327515 Copy full SHA for 3327515
File tree 5 files changed +11
-8
lines changed
5 files changed +11
-8
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change 16
16
name : gitsrv
17
17
spec :
18
18
containers :
19
- - image : stefanprodan /gitsrv:0.1.3
19
+ - image : fluxcd /gitsrv:v1.0.0
20
20
name : git
21
21
env :
22
22
- name : REPO
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ FLUX_ROOT_DIR=$(git rev-parse --show-toplevel)
6
6
export FLUX_ROOT_DIR
7
7
export E2E_DIR=" ${FLUX_ROOT_DIR} /test/e2e"
8
8
export FIXTURES_DIR=" ${E2E_DIR} /fixtures"
9
- KNOWN_HOSTS=$( cat " ${FIXTURES_DIR} /known_hosts" )
9
+ KNOWN_HOSTS=$( cat " ${FLUX_ROOT_DIR} /cache /known_hosts" )
10
10
export KNOWN_HOSTS
11
11
GITCONFIG=$( cat " ${FIXTURES_DIR} /gitconfig" )
12
12
export GITCONFIG
Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ fluxctl_install_cmd="fluxctl install --git-url=ssh://git@gitsrv/git-server/repos
52
52
function install_flux_with_fluxctl() {
53
53
kustomization_dir=${1:- base/ flux}
54
54
key_values_varname=${2}
55
- kubectl -n " ${FLUX_NAMESPACE} " create configmap flux-known-hosts --from-file=" ${E2E_DIR} /fixtures /known_hosts"
55
+ kubectl -n " ${FLUX_NAMESPACE} " create configmap flux-known-hosts --from-file=" ${FLUX_ROOT_DIR} /cache /known_hosts"
56
56
local kustomtmp
57
57
kustomtmp=" $( mktemp -d) "
58
58
defer rm -rf " '${kustomtmp} '"
@@ -87,7 +87,7 @@ function install_git_srv() {
87
87
defer rm -rf " '$gen_dir '"
88
88
kubectl create secret generic flux-git-deploy \
89
89
--namespace=" ${FLUX_NAMESPACE} " \
90
- --from-file=" ${FIXTURES_DIR} /known_hosts" \
90
+ --from-file=" ${FLUX_ROOT_DIR} /cache /known_hosts" \
91
91
--from-file=" $gen_dir /id_rsa" \
92
92
--from-file=identity=" $gen_dir /id_rsa" \
93
93
--from-file=" $gen_dir /id_rsa.pub"
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ CACHE_DIR="${FLUX_ROOT_DIR}/cache/$CURRENT_OS_ARCH"
12
12
13
13
KIND_VERSION=v0.7.0
14
14
KUBE_VERSION=v1.14.10
15
+ GITSRV_VERSION=v1.0.0
15
16
KIND_CACHE_PATH=" ${CACHE_DIR} /kind-$KIND_VERSION "
16
17
KIND_CLUSTER_PREFIX=flux-e2e
17
18
BATS_EXTRA_ARGS=" "
@@ -20,6 +21,11 @@ BATS_EXTRA_ARGS=""
20
21
source " ${E2E_DIR} /lib/defer.bash"
21
22
trap run_deferred EXIT
22
23
24
+ function download_known_hosts() {
25
+ mkdir -p " ${FLUX_ROOT_DIR} /cache"
26
+ curl -sL " https://github.com/fluxcd/gitsrv/releases/download/${GITSRV_VERSION} /known_hosts.txt" > " ${FLUX_ROOT_DIR} /cache/known_hosts"
27
+ }
28
+
23
29
function install_kind() {
24
30
if [ ! -f " ${KIND_CACHE_PATH} " ]; then
25
31
echo ' >>> Downloading Kind'
@@ -62,6 +68,7 @@ if ! kubectl version > /dev/null 2>&1; then
62
68
fi
63
69
64
70
echo ' >>> Running the tests'
71
+ download_known_hosts
65
72
# Run all tests by default but let users specify which ones to run, e.g. with E2E_TESTS='11_*' make e2e
66
73
E2E_TESTS=${E2E_TESTS:- .}
67
74
(
You can’t perform that action at this time.
0 commit comments