diff --git a/test/images/volume/gluster/BASEIMAGE b/test/images/volume/gluster/BASEIMAGE new file mode 100644 index 00000000000..1db25cbc831 --- /dev/null +++ b/test/images/volume/gluster/BASEIMAGE @@ -0,0 +1,3 @@ +amd64=fedora:28 +arm64=arm64v8/fedora:28 +ppc64le=ppc64le/fedora:28 diff --git a/test/images/volumes-tester/gluster/Dockerfile b/test/images/volume/gluster/Dockerfile similarity index 92% rename from test/images/volumes-tester/gluster/Dockerfile rename to test/images/volume/gluster/Dockerfile index 4c2785db5ba..3cfa358eb01 100644 --- a/test/images/volumes-tester/gluster/Dockerfile +++ b/test/images/volume/gluster/Dockerfile @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM fedora:26 +FROM BASEIMAGE + +CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/ + RUN yum -y install hostname glusterfs-server && yum clean all ADD glusterd.vol /etc/glusterfs/ ADD run_gluster.sh /usr/local/bin/ diff --git a/test/images/volumes-tester/gluster/README.md b/test/images/volume/gluster/README.md similarity index 100% rename from test/images/volumes-tester/gluster/README.md rename to test/images/volume/gluster/README.md diff --git a/test/images/volume/gluster/VERSION b/test/images/volume/gluster/VERSION new file mode 100644 index 00000000000..d3827e75a5c --- /dev/null +++ b/test/images/volume/gluster/VERSION @@ -0,0 +1 @@ +1.0 diff --git a/test/images/volumes-tester/gluster/glusterd.vol b/test/images/volume/gluster/glusterd.vol similarity index 100% rename from test/images/volumes-tester/gluster/glusterd.vol rename to test/images/volume/gluster/glusterd.vol diff --git a/test/images/volumes-tester/gluster/index.html b/test/images/volume/gluster/index.html similarity index 100% rename from test/images/volumes-tester/gluster/index.html rename to test/images/volume/gluster/index.html diff --git a/test/images/volumes-tester/gluster/run_gluster.sh b/test/images/volume/gluster/run_gluster.sh similarity index 100% rename from test/images/volumes-tester/gluster/run_gluster.sh rename to test/images/volume/gluster/run_gluster.sh diff --git a/test/images/volume/iscsi/BASEIMAGE b/test/images/volume/iscsi/BASEIMAGE new file mode 100644 index 00000000000..1db25cbc831 --- /dev/null +++ b/test/images/volume/iscsi/BASEIMAGE @@ -0,0 +1,3 @@ +amd64=fedora:28 +arm64=arm64v8/fedora:28 +ppc64le=ppc64le/fedora:28 diff --git a/test/images/volumes-tester/iscsi/Dockerfile b/test/images/volume/iscsi/Dockerfile similarity index 95% rename from test/images/volumes-tester/iscsi/Dockerfile rename to test/images/volume/iscsi/Dockerfile index 26eccb59d58..cba82664c4e 100644 --- a/test/images/volumes-tester/iscsi/Dockerfile +++ b/test/images/volume/iscsi/Dockerfile @@ -12,7 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM fedora:26 +FROM BASEIMAGE + +CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/ RUN yum install -y iscsi-initiator-utils targetcli net-tools strace procps-ng psmisc && yum clean all ADD run_iscsid.sh /usr/local/bin/ diff --git a/test/images/volumes-tester/iscsi/README.md b/test/images/volume/iscsi/README.md similarity index 84% rename from test/images/volumes-tester/iscsi/README.md rename to test/images/volume/iscsi/README.md index 5dd01fd9536..68a39cff0da 100644 --- a/test/images/volumes-tester/iscsi/README.md +++ b/test/images/volume/iscsi/README.md @@ -8,7 +8,7 @@ Inspired by https://github.com/rvykydal/dockerfile-iscsid * The container needs to run with docker --privileged -block.tar.gz is a small ext2 filesystem created by `make block` (run as root!) +block.tar.gz is a small ext2 filesystem created by `create_block.sh` (run as root!) [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/images/volumes-tester/iscsi/README.md?pixel)]() diff --git a/test/images/volume/iscsi/VERSION b/test/images/volume/iscsi/VERSION new file mode 100644 index 00000000000..d3827e75a5c --- /dev/null +++ b/test/images/volume/iscsi/VERSION @@ -0,0 +1 @@ +1.0 diff --git a/test/images/volumes-tester/iscsi/block.tar.gz b/test/images/volume/iscsi/block.tar.gz similarity index 100% rename from test/images/volumes-tester/iscsi/block.tar.gz rename to test/images/volume/iscsi/block.tar.gz diff --git a/test/images/volumes-tester/iscsi/create_block.sh b/test/images/volume/iscsi/create_block.sh similarity index 100% rename from test/images/volumes-tester/iscsi/create_block.sh rename to test/images/volume/iscsi/create_block.sh diff --git a/test/images/volumes-tester/iscsi/initiatorname.iscsi b/test/images/volume/iscsi/initiatorname.iscsi similarity index 100% rename from test/images/volumes-tester/iscsi/initiatorname.iscsi rename to test/images/volume/iscsi/initiatorname.iscsi diff --git a/test/images/volumes-tester/iscsi/run_iscsid.sh b/test/images/volume/iscsi/run_iscsid.sh similarity index 100% rename from test/images/volumes-tester/iscsi/run_iscsid.sh rename to test/images/volume/iscsi/run_iscsid.sh diff --git a/test/images/volumes-tester/iscsi/saveconfig.json b/test/images/volume/iscsi/saveconfig.json similarity index 100% rename from test/images/volumes-tester/iscsi/saveconfig.json rename to test/images/volume/iscsi/saveconfig.json diff --git a/test/images/volume/nfs/BASEIMAGE b/test/images/volume/nfs/BASEIMAGE new file mode 100644 index 00000000000..c269d713256 --- /dev/null +++ b/test/images/volume/nfs/BASEIMAGE @@ -0,0 +1,3 @@ +amd64=centos:7 +arm64=arm64v8/centos:7 +ppc64le=ppc64le/centos:7 diff --git a/test/images/volumes-tester/nfs/Dockerfile b/test/images/volume/nfs/Dockerfile similarity index 93% rename from test/images/volumes-tester/nfs/Dockerfile rename to test/images/volume/nfs/Dockerfile index c7bceb12afc..2af5f1c4b4c 100644 --- a/test/images/volumes-tester/nfs/Dockerfile +++ b/test/images/volume/nfs/Dockerfile @@ -12,7 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM centos +FROM BASEIMAGE + +CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/ RUN yum -y install /usr/bin/ps nfs-utils && yum clean all RUN mkdir -p /exports ADD run_nfs.sh /usr/local/bin/ diff --git a/test/images/volumes-tester/nfs/README.md b/test/images/volume/nfs/README.md similarity index 100% rename from test/images/volumes-tester/nfs/README.md rename to test/images/volume/nfs/README.md diff --git a/test/images/volume/nfs/VERSION b/test/images/volume/nfs/VERSION new file mode 100644 index 00000000000..d3827e75a5c --- /dev/null +++ b/test/images/volume/nfs/VERSION @@ -0,0 +1 @@ +1.0 diff --git a/test/images/volumes-tester/nfs/index.html b/test/images/volume/nfs/index.html similarity index 100% rename from test/images/volumes-tester/nfs/index.html rename to test/images/volume/nfs/index.html diff --git a/test/images/volumes-tester/nfs/run_nfs.sh b/test/images/volume/nfs/run_nfs.sh similarity index 100% rename from test/images/volumes-tester/nfs/run_nfs.sh rename to test/images/volume/nfs/run_nfs.sh diff --git a/test/images/volume/rbd/BASEIMAGE b/test/images/volume/rbd/BASEIMAGE new file mode 100644 index 00000000000..1db25cbc831 --- /dev/null +++ b/test/images/volume/rbd/BASEIMAGE @@ -0,0 +1,3 @@ +amd64=fedora:28 +arm64=arm64v8/fedora:28 +ppc64le=ppc64le/fedora:28 diff --git a/test/images/volumes-tester/rbd/Dockerfile b/test/images/volume/rbd/Dockerfile similarity index 94% rename from test/images/volumes-tester/rbd/Dockerfile rename to test/images/volume/rbd/Dockerfile index 2c34651915e..ad6bb314ef5 100644 --- a/test/images/volumes-tester/rbd/Dockerfile +++ b/test/images/volume/rbd/Dockerfile @@ -15,7 +15,9 @@ # CEPH all in one # Based on image by Ricardo Rocha, ricardo@catalyst.net.nz -FROM fedora:26 +FROM BASEIMAGE + +CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/ # Base Packages RUN yum install -y wget strace psmisc procps-ng ceph ceph-fuse && yum clean all diff --git a/test/images/volume/rbd/README.md b/test/images/volume/rbd/README.md new file mode 100644 index 00000000000..29355167168 --- /dev/null +++ b/test/images/volume/rbd/README.md @@ -0,0 +1,5 @@ +# rbd and ceph target container for testing. + +* The container needs to run with docker --privileged + +block.tar.gz is a small ext2 filesystem created by `create_block.sh` (run as root!) diff --git a/test/images/volume/rbd/VERSION b/test/images/volume/rbd/VERSION new file mode 100644 index 00000000000..d3827e75a5c --- /dev/null +++ b/test/images/volume/rbd/VERSION @@ -0,0 +1 @@ +1.0 diff --git a/test/images/volumes-tester/rbd/block.tar.gz b/test/images/volume/rbd/block.tar.gz similarity index 100% rename from test/images/volumes-tester/rbd/block.tar.gz rename to test/images/volume/rbd/block.tar.gz diff --git a/test/images/volumes-tester/rbd/bootstrap.sh b/test/images/volume/rbd/bootstrap.sh similarity index 100% rename from test/images/volumes-tester/rbd/bootstrap.sh rename to test/images/volume/rbd/bootstrap.sh diff --git a/test/images/volumes-tester/rbd/ceph.conf.sh b/test/images/volume/rbd/ceph.conf.sh similarity index 100% rename from test/images/volumes-tester/rbd/ceph.conf.sh rename to test/images/volume/rbd/ceph.conf.sh diff --git a/test/images/volumes-tester/rbd/create_block.sh b/test/images/volume/rbd/create_block.sh similarity index 100% rename from test/images/volumes-tester/rbd/create_block.sh rename to test/images/volume/rbd/create_block.sh diff --git a/test/images/volumes-tester/rbd/keyring b/test/images/volume/rbd/keyring similarity index 100% rename from test/images/volumes-tester/rbd/keyring rename to test/images/volume/rbd/keyring diff --git a/test/images/volumes-tester/rbd/mds.sh b/test/images/volume/rbd/mds.sh similarity index 100% rename from test/images/volumes-tester/rbd/mds.sh rename to test/images/volume/rbd/mds.sh diff --git a/test/images/volumes-tester/rbd/mon.sh b/test/images/volume/rbd/mon.sh similarity index 100% rename from test/images/volumes-tester/rbd/mon.sh rename to test/images/volume/rbd/mon.sh diff --git a/test/images/volumes-tester/rbd/osd.sh b/test/images/volume/rbd/osd.sh similarity index 100% rename from test/images/volumes-tester/rbd/osd.sh rename to test/images/volume/rbd/osd.sh diff --git a/test/images/volumes-tester/ceph/Dockerfile b/test/images/volumes-tester/ceph/Dockerfile deleted file mode 100644 index 9286a9f84b3..00000000000 --- a/test/images/volumes-tester/ceph/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2016 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM centos:6 - -ADD install.sh /usr/local/bin/ -RUN /usr/local/bin/install.sh -ADD init.sh /usr/local/bin/ -ADD index.html /tmp/ -RUN chmod 644 /tmp/index.html - -EXPOSE 6789/tcp - -ENTRYPOINT ["/usr/local/bin/init.sh"] diff --git a/test/images/volumes-tester/ceph/Makefile b/test/images/volumes-tester/ceph/Makefile deleted file mode 100644 index 8abd08d0100..00000000000 --- a/test/images/volumes-tester/ceph/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2016 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -TAG = 0.1 -PREFIX = gcr.io/kubernetes-e2e-test-images - -all: push - -container: image - -image: - docker build --pull -t $(PREFIX)/volume-ceph . # Build new image and automatically tag it as latest - docker tag $(PREFIX)/volume-ceph $(PREFIX)/volume-ceph:$(TAG) # Add the version tag to the latest image - -push: image - docker push $(PREFIX)/volume-ceph # Push image tagged as latest to repository - docker push $(PREFIX)/volume-ceph:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag) - -clean: diff --git a/test/images/volumes-tester/ceph/README.md b/test/images/volumes-tester/ceph/README.md deleted file mode 100644 index 267ec8747a2..00000000000 --- a/test/images/volumes-tester/ceph/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Ceph server container for testing - -This container exports ceph fs with an index.html inside. - -Used by test/e2e/* to test CephFSVolumeSource. Not for production use! - - -[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/images/volumes-tester/ceph/README.md?pixel)]() diff --git a/test/images/volumes-tester/ceph/index.html b/test/images/volumes-tester/ceph/index.html deleted file mode 100644 index 337469d71b2..00000000000 --- a/test/images/volumes-tester/ceph/index.html +++ /dev/null @@ -1 +0,0 @@ -Hello Ceph! diff --git a/test/images/volumes-tester/ceph/init.sh b/test/images/volumes-tester/ceph/init.sh deleted file mode 100755 index f7981405e5d..00000000000 --- a/test/images/volumes-tester/ceph/init.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2015 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#set -e -set -x - -# clean up -rm -f /etc/ceph/* - -pkill -9 ceph-mon -pkill -9 ceph-osd -pkill -9 ceph-mds - -mkdir -p /var/lib/ceph -mkdir -p /var/lib/ceph/osd -mkdir -p /var/lib/ceph/osd/ceph-0 - -# create hostname for ceph monitor -MASTER=`hostname -s` - -ip=$(ip -4 -o a | grep eth0 | awk '{print $4}' | cut -d'/' -f1) -echo "$ip $MASTER" >> /etc/hosts - -#create ceph cluster -ceph-deploy --overwrite-conf new ${MASTER} -ceph-deploy --overwrite-conf mon create-initial ${MASTER} -ceph-deploy --overwrite-conf mon create ${MASTER} -ceph-deploy gatherkeys ${MASTER} - -# set osd params for minimal configuration -echo "osd crush chooseleaf type = 0" >> /etc/ceph/ceph.conf -echo "osd journal size = 100" >> /etc/ceph/ceph.conf -echo "osd pool default size = 1" >> /etc/ceph/ceph.conf -echo "osd pool default pgp num = 8" >> /etc/ceph/ceph.conf -echo "osd pool default pg num = 8" >> /etc/ceph/ceph.conf - -/sbin/service ceph -c /etc/ceph/ceph.conf stop mon.${MASTER} -/sbin/service ceph -c /etc/ceph/ceph.conf start mon.${MASTER} - -# create ceph osd -ceph osd create -ceph-osd -i 0 --mkfs --mkkey -ceph auth add osd.0 osd 'allow *' mon 'allow rwx' -i /var/lib/ceph/osd/ceph-0/keyring -ceph osd crush add 0 1 root=default host=${MASTER} -ceph-osd -i 0 -k /var/lib/ceph/osd/ceph-0/keyring - -#see if we are ready to go -ceph osd tree - -# create ceph fs -ceph osd pool create cephfs_data 4 -ceph osd pool create cephfs_metadata 4 -ceph fs new cephfs cephfs_metadata cephfs_data -ceph-deploy --overwrite-conf mds create ${MASTER} - -# uncomment the following for rbd test -# ceph osd pool create kube 4 -# rbd create foo --size 10 --pool kube - -ps -ef |grep ceph -ceph osd dump - -# add new client with a pre defined keyring -# this keyring must match the ceph secret in e2e test -cat > /etc/ceph/ceph.client.kube.keyring <> ~/.ssh/authorized_keys2 -cat ~/.ssh/id_rsa.pub |awk '{print $1, $2, "Generated"}' >> ~/.ssh/authorized_keys - -rpm -Uvh http://ceph.com/rpm/rhel6/noarch/ceph-release-1-0.el6.noarch.rpm -yum install -y -q python-itsdangerous python-werkzeug python-jinja2 python-flask ceph-deploy epel-release -# ceph pkg depends on epel-release -yum install -y -q ceph ceph-fuse diff --git a/test/images/volumes-tester/gluster/Makefile b/test/images/volumes-tester/gluster/Makefile deleted file mode 100644 index 6ddfe196423..00000000000 --- a/test/images/volumes-tester/gluster/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2016 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -TAG = 0.5 -PREFIX = gcr.io/kubernetes-e2e-test-images - -all: push - -container: image - -image: - docker build --pull -t $(PREFIX)/volume-gluster . # Build new image and automatically tag it as latest - docker tag $(PREFIX)/volume-gluster $(PREFIX)/volume-gluster:$(TAG) # Add the version tag to the latest image - -push: image - docker push $(PREFIX)/volume-gluster # Push image tagged as latest to repository - docker push $(PREFIX)/volume-gluster:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag) - -clean: diff --git a/test/images/volumes-tester/iscsi/Makefile b/test/images/volumes-tester/iscsi/Makefile deleted file mode 100644 index f6e6903e1b1..00000000000 --- a/test/images/volumes-tester/iscsi/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2016 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -TAG = 0.2 -PREFIX = gcr.io/kubernetes-e2e-test-images - -all: push - -container: image - -image: - # Build new image and automatically tag it as latest - docker build --pull -t $(PREFIX)/volume-iscsi . - # Add the version tag to the latest image - docker tag $(PREFIX)/volume-iscsi $(PREFIX)/volume-iscsi:$(TAG) - -block: - # Create block.tar.gz with ext2 block device with index.html inside. - # block.tar.gz is already available in git and users don't need to - # regenerate it, this target is here just for reference. - # Run as root! - ./create_block.sh - -push: image - # Push image tagged as latest to repository - docker push $(PREFIX)/volume-iscsi - # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag) - docker push $(PREFIX)/volume-iscsi:$(TAG) - -clean: diff --git a/test/images/volumes-tester/nfs/Makefile b/test/images/volumes-tester/nfs/Makefile deleted file mode 100644 index 5579421588b..00000000000 --- a/test/images/volumes-tester/nfs/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2016 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -TAG = 0.8 -PREFIX = gcr.io/kubernetes-e2e-test-images - -all: push - -container: image - -image: - docker build --pull -t $(PREFIX)/volume-nfs . # Build new image and automatically tag it as latest - docker tag $(PREFIX)/volume-nfs $(PREFIX)/volume-nfs:$(TAG) # Add the version tag to the latest image - -push: image - docker push $(PREFIX)/volume-nfs # Push image tagged as latest to repository - docker push $(PREFIX)/volume-nfs:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag) - -clean: diff --git a/test/images/volumes-tester/rbd/Makefile b/test/images/volumes-tester/rbd/Makefile deleted file mode 100644 index df64f669491..00000000000 --- a/test/images/volumes-tester/rbd/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2016 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -TAG = 0.2 -PREFIX = gcr.io/kubernetes-e2e-test-images - -all: push - -container: image - -image: - # Build new image and automatically tag it as latest - docker build --pull -t $(PREFIX)/volume-rbd . - # Add the version tag to the latest image - docker tag $(PREFIX)/volume-rbd $(PREFIX)/volume-rbd:$(TAG) - -block: - # Create block.tar.gz with ext2 block device with index.html inside. - # block.tar.gz is already available in git and users don't need to - # regenerate it, this target is here just for reference. - # Run as root! - ./create_block.sh - -push: image - # Push image tagged as latest to repository - docker push $(PREFIX)/volume-rbd - # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag) - docker push $(PREFIX)/volume-rbd:$(TAG) - -clean: diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index f9dfc6a4c67..88e930cb767 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -88,10 +88,10 @@ var ( ResourceController = ImageConfig{e2eRegistry, "resource-consumer/controller", "1.0", false} ServeHostname = ImageConfig{e2eRegistry, "serve-hostname", "1.1", false} TestWebserver = ImageConfig{e2eRegistry, "test-webserver", "1.0", false} - VolumeNFSServer = ImageConfig{e2eRegistry, "volume-nfs", "0.8", false} - VolumeISCSIServer = ImageConfig{e2eRegistry, "volume-iscsi", "0.2", false} - VolumeGlusterServer = ImageConfig{e2eRegistry, "volume-gluster", "0.5", false} - VolumeRBDServer = ImageConfig{e2eRegistry, "volume-rbd", "0.2", false} + VolumeNFSServer = ImageConfig{e2eRegistry, "volume/nfs", "1.0", false} + VolumeISCSIServer = ImageConfig{e2eRegistry, "volume/iscsi", "1.0", false} + VolumeGlusterServer = ImageConfig{e2eRegistry, "volume/gluster", "1.0", false} + VolumeRBDServer = ImageConfig{e2eRegistry, "volume/rbd", "1.0", false} ) func GetE2EImage(image ImageConfig) string {