java adapter tests no longer create docker volume for yum repository

Author: jennyowen

Makefile

@@ -144,39 +144,20 @@ out/rpm/SPECS/neo4j-java-adapter.spec: packaging/rpm-java-adapter/neo4j-java-ada
 	cp $< $@
 
 .PHONY: java-adapter-test
-java-adapter-test: java-adapter-test-yumrepo-build java-adapter-test-run
-
-# this target makes a docker volume that contains a yum repository of cyphershell and the java adapter
-# saves the volume id into a file so this step isn't run again until there's a make clean.
-tmp/java-adapter-test/yum-repo/volumeid: 	tmp/java-adapter-test/yum-repo/Dockerfile \
-											tmp/java-adapter-test/yum-repo/$(java_adapter_file) \
-											tmp/java-adapter-test/yum-repo/$(rpmfile)
-	cd $(@D) && docker build . --rm -t $(YUMREPO_IMAGEID)
-	docker volume create --name $(YUMREPO_VOLUMEID)
-	docker run --rm --volume $(YUMREPO_VOLUMEID):/repo $(YUMREPO_IMAGEID)
-	echo $(YUMREPO_VOLUMEID) > $@
-
-java-adapter-test-yumrepo-build: tmp/java-adapter-test/yum-repo/volumeid
-
-tmp/java-adapter-test/yum-repo/%.rpm: out/%.rpm
-	mkdir -p $(dir $@)
-	cp $< $@
-
-tmp/java-adapter-test/yum-repo/Dockerfile: packaging/test/java-adapter/YumRepo-Dockerfile
-	mkdir -p $(dir $@)
-	CYPHER_SHELL_FILE=$(rpmfile) JAVA_ADAPTER_FILE=$(java_adapter_file) envsubst '$${CYPHER_SHELL_FILE} $${JAVA_ADAPTER_FILE}' < $< > $@
-
-.PHONY: java-adapter-test-run
-java-adapter-test-run: 	tmp/java-adapter-test/tests/java-11-openjdk \
+java-adapter-test: 	tmp/java-adapter-test/tests/java-11-openjdk \
 						tmp/java-adapter-test/tests/java-1.8.0-openjdk-headless \
 						tmp/java-adapter-test/tests/java-1.8.0-openjdk
 
-tmp/java-adapter-test/tests/%: tmp/java-adapter-test/yum-repo/volumeid
+tmp/java-adapter-test/tests/%:	out/$(java_adapter_file) \
+								out/$(rpmfile) \
+								packaging/test/java-adapter/tempneo4j.repo \
+								packaging/test/java-adapter/Dockerfile \
+								packaging/test/java-adapter/entrypoint.sh
 	mkdir -p $@
-	cp packaging/test/java-adapter/tempneo4j.repo $@/tempneo4j.repo
-	TEST_JAVA=$* envsubst '$${TEST_JAVA}' < packaging/test/java-adapter/Centos7-Dockerfile > $@/Dockerfile
-	echo $(shell cat $<)
-	cd $@ && docker build . -t $(DOCKERUUIDRPM) && docker run --volume $(shell cat $<):/repo --rm $(DOCKERUUIDRPM)
+	cp $^ $@/
+	CYPHER_SHELL_FILE=$(rpmfile) JAVA_ADAPTER_FILE=$(java_adapter_file) TEST_JAVA=$* \
+		envsubst '$${CYPHER_SHELL_FILE} $${JAVA_ADAPTER_FILE} $${TEST_JAVA}' < packaging/test/java-adapter/Dockerfile > $@/Dockerfile
+	cd $@ && docker build . -t $(DOCKERUUIDRPM) && docker run --rm $(DOCKERUUIDRPM)
 
 
 # ======================= RPM CYPHER-SHELL =======================

packaging/rpm-java-adapter/neo4j-java-adapter.spec

@@ -4,7 +4,7 @@ Release:    1%{?dist}
 Summary:    Meta package so that Neo4j can be compatible with java 8 and java 11 in both openjdk and oracle
 License:    GPLv3
 
-Provides: jre = 11, java = 11, neo4j-java
+Provides: jre = 11, java = 11, jre-headless = 11
 Requires: jre-11
 BuildArch: noarch
 

packaging/rpm/cypher-shell.spec

@@ -9,7 +9,7 @@ URL: https://github.com/neo4j/cypher-shell
 Source0: https://github.com/neo4j/cypher-shell/archive/%{version}.tar.gz
 
 #Conflicts:
-Requires: which, jre >= 1.8
+Requires: which, jre-headless >= 1.8
 BuildArch: noarch
 Prefix: /usr
 

packaging/test/java-adapter/Centos7-Dockerfile

@@ -0,0 +1,15 @@
+FROM centos:7
+
+VOLUME /repo
+
+COPY ${CYPHER_SHELL_FILE} /repo/
+COPY ${JAVA_ADAPTER_FILE} /repo/
+COPY tempneo4j.repo /tmp/
+COPY entrypoint.sh /tmp/
+
+RUN yum --assumeyes install ${TEST_JAVA} createrepo bc && \
+    mv /tmp/tempneo4j.repo /etc/yum.repos.d/
+
+#ENTRYPOINT [ "ls", "-l", "/repo"]
+ENTRYPOINT [ "/tmp/entrypoint.sh", "${TEST_JAVA}" ]
+#ENTRYPOINT [ "test $(yum --assumeno install cypher-shell | grep -c ${TEST_JAVA} | bc) == '0'" ]

packaging/test/java-adapter/Dockerfile

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+javaTested=$1
+javaRegex="openjdk"
+createrepo /repo
+
+if [ $(yum --assumeno install cypher-shell | grep -c "${javaRegex}" | bc) != "0" ]; then
+    echo "Attempt to install java dependency "${javaTested} " FAILED. Here is the install output:"
+    yum --assumeno install cypher-shell
+    exit 1
+else
+    exit 0
+fi

packaging/test/java-adapter/YumRepo-Dockerfile

@@ -1,5 +1,5 @@
 [tempneo4j]
-    name=temp neo4j repo
-    baseurl=file:///repo
-    enabled=1
-    gpgcheck=0
+name=temp neo4j repo
+baseurl=file:///repo
+enabled=1
+gpgcheck=0