Skip to content

Commit 4af0571

Browse files
fabianvfdymurray
authored andcommitted
Use the :dev image as the base for testing (operator-framework#965)
1 parent f929921 commit 4af0571

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

hack/tests/e2e-ansible-molecule.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,17 @@ cp "$ROOTDIR/test/ansible-memcached/asserts.yml" memcached-operator/molecule/de
3333
cp "$ROOTDIR/test/ansible-memcached/molecule.yml" memcached-operator/molecule/test-local/molecule.yml
3434
cp -a "$ROOTDIR/test/ansible-memcached/memfin" memcached-operator/roles/
3535
cat "$ROOTDIR/test/ansible-memcached/watches-finalizer.yaml" >> memcached-operator/watches.yaml
36+
cat "$ROOTDIR/test/ansible-memcached/prepare-test-image.yml" >> memcached-operator/molecule/test-local/prepare.yml
3637

3738

3839
# Test local
3940
pushd memcached-operator
41+
sed -i 's|\(FROM quay.io/operator-framework/ansible-operator\)\(:.*\)\?|\1:dev|g' build/Dockerfile
4042
OPERATORDIR="$(pwd)"
4143
TEST_CLUSTER_PORT=24443 operator-sdk test local --namespace default
4244

4345
# Test cluster
4446
DEST_IMAGE="quay.io/example/memcached-operator:v0.0.2-test"
45-
sed -i 's|\(FROM quay.io/operator-framework/ansible-operator\)\(:.*\)\?|\1:dev|g' build/Dockerfile
4647
operator-sdk build --enable-tests "$DEST_IMAGE"
4748
trap_add 'remove_prereqs' EXIT
4849
deploy_prereqs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
- name: Dump the dev image
2+
command: docker save -o /tmp/dev-operator.tar quay.io/operator-framework/ansible-operator:dev
3+
- name: Copy the image to the kind container
4+
command: docker cp /tmp/dev-operator.tar kind-test-local:/dev-operator.tar
5+
6+
- name: Make dev operator image available
7+
hosts: k8s
8+
gather_facts: no
9+
tasks:
10+
- name: Make dev operator available
11+
command: docker load -i /dev-operator.tar
12+
13+
- name: Clean up
14+
hosts: localhost
15+
connection: local
16+
gather_facts: no
17+
tasks:
18+
- name: remove dev-operator.tar
19+
file:
20+
path: /tmp/dev-operator.tar
21+
state: absent

0 commit comments

Comments
 (0)