File tree Expand file tree Collapse file tree 8 files changed +23
-23
lines changed Expand file tree Collapse file tree 8 files changed +23
-23
lines changed Original file line number Diff line number Diff line change 15
15
with :
16
16
cluster_name : kind-${{ github.run_id }}
17
17
kubectl_version : " v1.25.2"
18
- node_image : " docker.io/warmmetal/kindest-node-crio:v1.25.2-csi-driver-image "
18
+ node_image : " docker.io/warmmetal/kindest-node-crio:v1.25.2-container-image- csi-driver"
19
19
- name : Install private registry
20
20
run : ./hack/ci/setup_private_registry.sh
21
21
- name : Build image
Original file line number Diff line number Diff line change 15
15
with :
16
16
cluster_name : kind-${{ github.run_id }}
17
17
kubectl_version : " v1.25.2"
18
- node_image : " docker.io/warmmetal/kindest-node-crio:v1.25.2-csi-driver-image "
18
+ node_image : " docker.io/warmmetal/kindest-node-crio:v1.25.2-container-image- csi-driver"
19
19
- name : Build image
20
20
run : ./hack/ci/build.sh
21
21
- name : Set image version
Original file line number Diff line number Diff line change @@ -16,10 +16,10 @@ build:
16
16
17
17
.PHONY : sanity
18
18
sanity :
19
- $(IMAGE_BUILDER ) $(IMAGE_BUILD_CMD ) build -t local.test/csi-driver-image -test:sanity test/sanity
19
+ $(IMAGE_BUILDER ) $(IMAGE_BUILD_CMD ) build -t local.test/container-image- csi-driver-test:sanity test/sanity
20
20
kubectl delete --ignore-not-found -f test/sanity/manifest.yaml
21
21
kubectl apply --wait -f test/sanity/manifest.yaml
22
- kubectl -n cliapp-system wait --for=condition=complete job/csi-driver-image -sanity-test
22
+ kubectl -n cliapp-system wait --for=condition=complete job/container-image- csi-driver-sanity-test
23
23
24
24
.PHONY : e2e
25
25
e2e :
Original file line number Diff line number Diff line change 1
1
apiVersion : v1
2
2
kind : ServiceAccount
3
3
metadata :
4
- name : csi-driver-image -e2e-test
4
+ name : container-image- csi-driver-e2e-test
5
5
namespace : cliapp-system
6
6
---
7
7
apiVersion : rbac.authorization.k8s.io/v1
8
8
kind : ClusterRoleBinding
9
9
metadata :
10
- name : csi-driver-image -e2e-test
10
+ name : container-image- csi-driver-e2e-test
11
11
roleRef :
12
12
apiGroup : rbac.authorization.k8s.io
13
13
kind : ClusterRole
14
14
name : cluster-admin
15
15
subjects :
16
16
- kind : ServiceAccount
17
- name : csi-driver-image -e2e-test
17
+ name : container-image- csi-driver-e2e-test
18
18
namespace : cliapp-system
19
19
---
20
20
apiVersion : batch/v1
21
21
kind : Job
22
22
metadata :
23
- name : csi-driver-image -e2e-test
23
+ name : container-image- csi-driver-e2e-test
24
24
namespace : cliapp-system
25
25
spec :
26
26
template :
27
27
metadata :
28
- name : csi-driver-image -e2e-test
28
+ name : container-image- csi-driver-e2e-test
29
29
spec :
30
- serviceAccountName : csi-driver-image -e2e-test
30
+ serviceAccountName : container-image- csi-driver-e2e-test
31
31
containers :
32
- - name : csi-driver-image -e2e-test
33
- image : local.test/csi-driver-image -test:e2e
32
+ - name : container-image- csi-driver-e2e-test
33
+ image : local.test/container-image- csi-driver-test:e2e
34
34
env :
35
35
- name : KUBE_SSH_USER
36
36
value : docker
Original file line number Diff line number Diff line change 4
4
5
5
export IMAGE_TAG=v0.7.0
6
6
export GITHUB_RUN_ID=1
7
- export NODE_IMAGE=docker.io/warmmetal/kindest-node-crio:v1.25.2-csi-driver-image
7
+ export NODE_IMAGE=docker.io/warmmetal/kindest-node-crio:v1.25.2-container-image- csi-driver
8
8
export VALUE_FILE=$( dirname " ${BASH_SOURCE[0]} " ) /crio-helm-values.yaml
9
9
10
10
HELM_NAME=' wm-csi-integration-tests'
@@ -29,4 +29,4 @@ $(dirname "${BASH_SOURCE[0]}")/../../hack/ci/test.sh
29
29
30
30
helm uninstall -n kube-system ${HELM_NAME} --wait
31
31
32
- set +e
32
+ set +e
Original file line number Diff line number Diff line change 1
1
apiVersion : batch/v1
2
2
kind : Job
3
3
metadata :
4
- name : csi-driver-image -sanity-test
4
+ name : container-image- csi-driver-sanity-test
5
5
namespace : cliapp-system
6
6
spec :
7
7
template :
8
8
metadata :
9
- name : csi-driver-image -sanity-test
9
+ name : container-image- csi-driver-sanity-test
10
10
spec :
11
11
serviceAccountName : csi-image-warm-metal
12
12
containers :
13
- - name : csi-driver-image -sanity-test
14
- image : local.test/csi-driver-image -test:sanity
13
+ - name : container-image- csi-driver-sanity-test
14
+ image : local.test/container-image- csi-driver-test:sanity
15
15
volumeMounts :
16
16
- mountPath : /csi
17
17
name : socket-dir
Original file line number Diff line number Diff line change 1
1
apiVersion : batch/v1
2
2
kind : Job
3
3
metadata :
4
- name : csi-driver-image -test
4
+ name : container-image- csi-driver-test
5
5
namespace : kube-system
6
6
spec :
7
7
template :
8
8
metadata :
9
- name : csi-driver-image -test
9
+ name : container-image- csi-driver-test
10
10
spec :
11
11
serviceAccountName : csi-image-warm-metal
12
12
containers :
13
- - name : csi-driver-image -test
14
- image : warmmetal/csi-driver-image -test
13
+ - name : container-image- csi-driver-test
14
+ image : warmmetal/container-image- csi-driver-test
15
15
env :
16
16
- name : HTTP_PROXY
17
17
value : http://192.168.64.1:1087
Original file line number Diff line number Diff line change 7
7
- image : warmmetal/csi-image
8
8
docker :
9
9
dockerfile : Dockerfile
10
- - image : warmmetal/csi-driver-image -test
10
+ - image : warmmetal/container-image- csi-driver-test
11
11
docker :
12
12
dockerfile : " test.dockerfile"
13
13
# custom:
You can’t perform that action at this time.
0 commit comments