Skip to content

Commit 637e889

Browse files
authored
chore: update test manifests with new repo name (#129)
1 parent 282bd48 commit 637e889

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

.github/workflows/cri-o.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
cluster_name: kind-${{ github.run_id }}
1717
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"
1919
- name: Install private registry
2020
run: ./hack/ci/setup_private_registry.sh
2121
- name: Build image

.github/workflows/restart-ds-crio.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
cluster_name: kind-${{ github.run_id }}
1717
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"
1919
- name: Build image
2020
run: ./hack/ci/build.sh
2121
- name: Set image version

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ build:
1616

1717
.PHONY: sanity
1818
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
2020
kubectl delete --ignore-not-found -f test/sanity/manifest.yaml
2121
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
2323

2424
.PHONY: e2e
2525
e2e:

test/e2e/manifest.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
apiVersion: v1
22
kind: ServiceAccount
33
metadata:
4-
name: csi-driver-image-e2e-test
4+
name: container-image-csi-driver-e2e-test
55
namespace: cliapp-system
66
---
77
apiVersion: rbac.authorization.k8s.io/v1
88
kind: ClusterRoleBinding
99
metadata:
10-
name: csi-driver-image-e2e-test
10+
name: container-image-csi-driver-e2e-test
1111
roleRef:
1212
apiGroup: rbac.authorization.k8s.io
1313
kind: ClusterRole
1414
name: cluster-admin
1515
subjects:
1616
- kind: ServiceAccount
17-
name: csi-driver-image-e2e-test
17+
name: container-image-csi-driver-e2e-test
1818
namespace: cliapp-system
1919
---
2020
apiVersion: batch/v1
2121
kind: Job
2222
metadata:
23-
name: csi-driver-image-e2e-test
23+
name: container-image-csi-driver-e2e-test
2424
namespace: cliapp-system
2525
spec:
2626
template:
2727
metadata:
28-
name: csi-driver-image-e2e-test
28+
name: container-image-csi-driver-e2e-test
2929
spec:
30-
serviceAccountName: csi-driver-image-e2e-test
30+
serviceAccountName: container-image-csi-driver-e2e-test
3131
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
3434
env:
3535
- name: KUBE_SSH_USER
3636
value: docker

test/integration/test-in-kind-crio.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44

55
export IMAGE_TAG=v0.7.0
66
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
88
export VALUE_FILE=$(dirname "${BASH_SOURCE[0]}")/crio-helm-values.yaml
99

1010
HELM_NAME='wm-csi-integration-tests'
@@ -29,4 +29,4 @@ $(dirname "${BASH_SOURCE[0]}")/../../hack/ci/test.sh
2929

3030
helm uninstall -n kube-system ${HELM_NAME} --wait
3131

32-
set +e
32+
set +e

test/sanity/manifest.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
apiVersion: batch/v1
22
kind: Job
33
metadata:
4-
name: csi-driver-image-sanity-test
4+
name: container-image-csi-driver-sanity-test
55
namespace: cliapp-system
66
spec:
77
template:
88
metadata:
9-
name: csi-driver-image-sanity-test
9+
name: container-image-csi-driver-sanity-test
1010
spec:
1111
serviceAccountName: csi-image-warm-metal
1212
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
1515
volumeMounts:
1616
- mountPath: /csi
1717
name: socket-dir

test/unit/manifest.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
apiVersion: batch/v1
22
kind: Job
33
metadata:
4-
name: csi-driver-image-test
4+
name: container-image-csi-driver-test
55
namespace: kube-system
66
spec:
77
template:
88
metadata:
9-
name: csi-driver-image-test
9+
name: container-image-csi-driver-test
1010
spec:
1111
serviceAccountName: csi-image-warm-metal
1212
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
1515
env:
1616
- name: HTTP_PROXY
1717
value: http://192.168.64.1:1087

test/unit/skaffold.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ build:
77
- image: warmmetal/csi-image
88
docker:
99
dockerfile: Dockerfile
10-
- image: warmmetal/csi-driver-image-test
10+
- image: warmmetal/container-image-csi-driver-test
1111
docker:
1212
dockerfile: "test.dockerfile"
1313
# custom:

0 commit comments

Comments
 (0)