Enable quorum ATs (#2491)

Signed-off-by: Stefan Pingel <stefan.pingel@consensys.net>

.circleci/config.yml

@@ -201,7 +201,7 @@ jobs:
       - run:
           name: Quorum Acceptance Tests
           no_output_timeout: 40m
-          command: ./gradlew --no-daemon acceptanceTestsQuorum || true # ignore until the quorum ATs CI loop is fixed
+          command: ./gradlew --no-daemon acceptanceTestsQuorum
       - store_artifacts:
           path: build/quorum-at
           destination: quorum-at-artifacts

build.gradle

@@ -652,40 +652,40 @@ task testDocker {
   }
 }
 
-//task acceptanceTestsQuorum {
+task acceptanceTestsQuorum {
-//  dependsOn distDocker
+  dependsOn distDocker
-//  /**
+  /**
-//   * Tags Description
+   * Tags Description
-//   *
+   *
-//   * Basic tests for private and public tx: basic
+   * Basic tests for private and public tx: basic
-//   * Start a Besu/EthSigner/Tessera network with IBFT2: networks/typical-besu::ibft2
+   * Start a Besu/EthSigner/Tessera network with IBFT2: networks/typical-besu::ibft2
-//   *
+   *
-//   * Not available features in Besu: privacy-enhancements-disabled, extension, mps
+   * Not available features in Besu: privacy-enhancements-disabled, extension, mps
-//   * Not available RPC methods in Besu: async, storage-root, get-quorum-payload, personal-api-signed
+   * Not available RPC methods in Besu: async, storage-root, get-quorum-payload, personal-api-signed
-//   *
+   *
-//   * Ignored for now (privacy-polishing): graphql, eth-api-signed, spam, nosupport
+   * Ignored for now (privacy-polishing): graphql, eth-api-signed, spam, nosupport
-//   *
+   *
-//   * LOGGING_LEVEL_COM_QUORUM_GAUGE=DEBUG -- enables HTTP JSON-RPC logging
+   * LOGGING_LEVEL_COM_QUORUM_GAUGE=DEBUG -- enables HTTP JSON-RPC logging
-//   */
+   */
-//  def tags = "(basic && !nosupport && !mps && !spam && !eth-api-signed && !privacy-enhancements-disabled && !graphql && !async && !extension && !storage-root && !get-quorum-payload && !personal-api-signed) || networks/typical-besu::ibft2"
+  def tags = "(basic && !nosupport && !mps && !spam && !eth-api-signed && !privacy-enhancements-disabled && !graphql && !async && !extension && !storage-root && !get-quorum-payload && !personal-api-signed) || networks/typical-besu::ibft2"
-//
+
-//  doLast {
+  doLast {
-//    exec {
+    exec {
-//      def variant = "openjdk-latest"
+      def variant = "openjdk-latest"
-//      def variantDirectory = "${buildDir}/quorum-at/${variant}"
+      def variantDirectory = "${buildDir}/quorum-at/${variant}"
-//      def dataDirectory = "${variantDirectory}/data"
+      def dataDirectory = "${variantDirectory}/data"
-//      def reportsDirectory = "${variantDirectory}/reports"
+      def reportsDirectory = "${variantDirectory}/reports"
-//      new File(dataDirectory).mkdirs()
+      new File(dataDirectory).mkdirs()
-//      new File(reportsDirectory).mkdirs()
+      new File(reportsDirectory).mkdirs()
-//
+
-//      def image = project.hasProperty('release.releaseVersion') ? "hyperledger/besu:" + project.property('release.releaseVersion') : "hyperledger/besu:${project.version}"
+      def image = project.hasProperty('release.releaseVersion') ? "hyperledger/besu:" + project.property('release.releaseVersion') : "hyperledger/besu:${project.version}"
-//      def dockerEnv = "--env LOGGING_LEVEL_COM_QUORUM_GAUGE=DEBUG --env TF_VAR_besu_docker_image='{name=\"${image}-${variant}\",local=true}'"
+      def dockerEnv = "--env LOGGING_LEVEL_COM_QUORUM_GAUGE=DEBUG --env TF_VAR_besu_docker_image='{name=\"${image}-${variant}\",local=true}'"
-//      def dockerVolumes = "-v ${reportsDirectory}:/workspace/target/gauge/reports/ -v /var/run/docker.sock:/var/run/docker.sock -v ${dataDirectory}:${dataDirectory}"
+      def dockerVolumes = "-v ${reportsDirectory}:/workspace/target/gauge/reports/ -v /var/run/docker.sock:/var/run/docker.sock -v ${dataDirectory}:${dataDirectory}"
-//      executable "sh"
+      executable "sh"
-//      args "-c", "docker run ${dockerEnv} --rm --network host ${dockerVolumes} quorumengineering/acctests:latest test -PgaugeFailSafe -Pauto -Dtags=\"${tags}\" -Dauto.outputDir=${dataDirectory} -Dnetwork.forceDestroy=true -Dauto.jobid=${variant}"
+      args "-c", "docker run ${dockerEnv} --rm --network host ${dockerVolumes} quorumengineering/acctests:latest test -PgaugeFailSafe -Pauto -Dtags=\"${tags}\" -Dauto.outputDir=${dataDirectory} -Dnetwork.forceDestroy=true -Dauto.jobid=${variant}"
-//    }
+    }
-//  }
+  }
-//}
+}
 
 task dockerUpload {
   dependsOn distDocker