Updated Besu image to use build artifact.

Signed-off-by: Mark Terry <mark.terry@consensys.net>

.circleci/config.yml

@@ -295,7 +295,6 @@ workflows:
       - containerTests:
           requires:
             - assemble
-            - buildDocker
           context:
             - besu-dockerhub-ro
       - buildDocker:

container-tests/tests/build.gradle

@@ -30,4 +30,9 @@ test.enabled = false
 
 task containerTests(type: Test) {
   description = 'Runs GoQuorum <> Besu container tests.'
+  dependsOn(rootProject.installDist)
+  def dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}"
+  def imageName = "hyperledger/besu"
+  def image = "${imageName}:${dockerBuildVersion}"
+  systemProperty 'containertest.imagename', image
 }

container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java

@@ -42,7 +42,7 @@
 
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class ContainerTestBase {
-  private final String besuVersion = "develop";
+  private final String besuImage = System.getProperty("containertest.imagename");
   private final String goQuorumVersion = "21.1.0";
   private final String tesseraVersion = "21.1.0";
 
@@ -151,7 +151,7 @@ public void tearDown() throws IOException {
   }
 
   private GenericContainer buildBesuContainer() {
-    return new GenericContainer("hyperledger/besu:" + besuVersion)
+    return new GenericContainer(besuImage)
         .withNetwork(containerNetwork)
         .withNetworkAliases(besuNetworkAlias)
         .withExposedPorts(besuRpcPort, besuP2pPort)