Merge pull request #6 from mbwhite/azure-pipeline-corrections

Fix Azure Pipelines (master)

Author: mastersingh24

build.gradle

@@ -6,16 +6,28 @@
 
 apply plugin: 'idea'
 apply plugin: 'eclipse-wtp'
-
+apply plugin: 'com.dorongold.task-tree'
 version = '2.0.0-SNAPSHOT'
 
+buildscript {
+  repositories {
+    maven {
+      url "https://plugins.gradle.org/m2/"
+    }
+  }
+  dependencies {
+    classpath "gradle.plugin.com.dorongold.plugins:task-tree:1.4"
+  }
+}
+
+
 allprojects {
     repositories {
+        mavenCentral()
         mavenLocal()
         jcenter()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
         maven { url "https://www.jitpack.io" }
-        mavenCentral()
     }
 }
 
@@ -41,7 +53,7 @@ subprojects {
 
     if (!it.name.equals('fabric-chaincode-protos')) {
         tasks.withType(JavaCompile) {
-            options.compilerArgs << "-Xlint:all,-try" << "-Werror"
+            options.compilerArgs << "-Xlint:all,-try" 
         }
     }
 

ci/azure-pipelines.yml

@@ -4,6 +4,20 @@
 # 
 # fabric-chaincode-java azure pipeline configuration.
 # 
+name: RELEASE-$(Date:yyyyMMdd)$(Rev:.rrr)
+
+# Daily build for final quality
+# cf https://crontab.guru/#0_23_*_*_*
+schedules:
+  - cron: "0 23 * * *"
+    displayName: 'Chaincode Java Nightly Driver'
+    branches:
+      include:
+        - master
+        - release-1.4
+    always: true
+
+
 trigger:
   branches:
     include:
@@ -17,9 +31,17 @@ trigger:
 # to know to produce tests results in XML format for Azure to consume, for developers
 # this isn't set so command line output is given
 # 
+# These are custom defined variables, the pipeline one is currently used for the build scripts
+# to know to produce tests results in XML format for Azure to consume, for developers
+# this isn't set so command line output is given
+# 
+# Chaincode_Java_Creds is the protected group of keys for publishing
 variables:
-  component: fabric-chaincode-node
-  pipeline: ci 
+  - group: Chaincode_Java_Creds
+  - name: component
+    value: fabric-chaincode-java
+  - name: pipeline
+    value: ci 
 
 pool:
   vmImage: 'ubuntu-latest'

fabric-chaincode-integration-test/bin/.gitignore

@@ -1,8 +1,27 @@
 dependencies {
-    testCompile 'org.testcontainers:testcontainers:1.10.3'
+    compile project(':fabric-chaincode-docker')
     testCompile 'org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.4.4'
+    compile project(':fabric-chaincode-shim')
+    implementation group: 'org.json', name: 'json', version: '20180813'
 }
 
+
+ test {
+    // Always run tests, even when nothing changed.
+    dependsOn 'cleanTest'
+    
+    // Show test results.
+    testLogging {
+        events "passed", "skipped", "failed"
+        showExceptions true
+        showCauses true
+        showStandardStreams true
+        exceptionFormat "full"
+        
+    }
+ }
+
+
 task getLatestDockerImages{
     doLast {
         exec {
@@ -11,7 +30,11 @@ task getLatestDockerImages{
         }
     }
 }
-compileJava.dependsOn project(':fabric-chaincode-docker').buildImage
-compileJava.dependsOn project(':fabric-chaincode-example-sacc-jars').jar
+
+build.dependsOn project(':fabric-chaincode-docker').buildImage
+
+
+// compileJava.dependsOn project(':fabric-chaincode-docker').buildImage
+// compileJava.dependsOn project(':fabric-chaincode-example-sacc-jars').jar
 test.dependsOn project.getLatestDockerImages
 

fabric-chaincode-integration-test/build.gradle

@@ -0,0 +1,119 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package org.hyperleder.fabric.shim.integration;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+public class Command {
+
+    protected List<String> cmd;
+    protected Map<String, String> env;
+
+    Command(List<String> cmd) {
+        this.cmd = cmd;
+        this.env = new HashMap<>();
+
+    }
+
+    class Result {
+        ArrayList<String> stdout;
+        ArrayList<String> stderr;
+        int exitcode;
+    }
+
+    /**
+     * Run but don't suppress the output being printed directly
+     */
+    public Result run() {
+        return this.run(false);
+    }
+
+    /**
+     * Run the command, and process the output to arrays for later parsing and checking
+     * 
+     * @param quiet true if the output should NOT be printed directly to System.out/System.err
+     */
+    public Result run(boolean quiet) {
+
+        ProcessBuilder processBuilder = new ProcessBuilder(cmd);
+        processBuilder.environment().putAll(env);
+        final Result result = new Result();
+
+        System.out.println("Running:" + this.toString());
+        try {
+            Process process = processBuilder.start();
+
+            CompletableFuture<ArrayList<String>> soutFut = readOutStream(process.getInputStream(),quiet?null:System.out);
+            CompletableFuture<ArrayList<String>> serrFut = readOutStream(process.getErrorStream(),quiet?null:System.err);
+
+            CompletableFuture<Result> resultFut = soutFut.thenCombine(serrFut, (stdout, stderr) -> {
+                 // print to current stderr the stderr of process and return the stdout
+                result.stderr = stderr;
+                result.stdout = stdout;
+                return result;
+             });
+
+            result.exitcode = process.waitFor();
+            // get stdout once ready, blocking
+            resultFut.get();
+
+        } catch (IOException | InterruptedException | ExecutionException e) {
+            e.printStackTrace();
+            result.exitcode = -1;
+        }
+
+        return result;
+    }
+
+    /**
+     * Collect the information from the executed process and add them to a result object
+     * 
+     * @param is
+     * @param stream
+     * @return Completable Future with the array list of the stdout/sstderr
+     */
+    CompletableFuture<ArrayList<String>> readOutStream(InputStream is, PrintStream stream) {
+        return CompletableFuture.supplyAsync(() -> {
+            try (InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr);) {
+                ArrayList<String> res = new ArrayList<String>();
+                String inputLine;
+                while ((inputLine = br.readLine()) != null) {
+                    if (stream!=null) stream.println(inputLine);
+                    res.add(inputLine);
+                }
+                return res;
+            } catch (Throwable e) {
+                throw new RuntimeException("problem with executing program", e);
+            }
+        });
+    }
+
+    public String toString() {
+        return "[" + String.join(" ", cmd) + "]";
+    }
+
+    static public class Builder<T extends Command> implements Cloneable {
+        public Builder<T> duplicate() {
+            try {
+                return (Builder<T>) this.clone();
+            } catch (CloneNotSupportedException e) {
+                e.printStackTrace();
+                return null;
+            }
+        }
+    }
+}

fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/Command.java

@@ -0,0 +1,77 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+package org.hyperleder.fabric.shim.integration;
+import java.util.ArrayList;
+import java.util.List;
+
+/** Represents the 'docker' cli command
+ * 
+ * 
+ *
+ */
+public class Docker extends Command {
+
+    public static DockerBuilder newBuilder(){
+        return new DockerBuilder();
+    }
+
+    static public class DockerBuilder implements Cloneable {
+        boolean exec;
+        String container;
+        String script;
+
+        public DockerBuilder duplicate() {
+            try {
+                return (DockerBuilder) this.clone();
+            } catch (CloneNotSupportedException e) {
+                e.printStackTrace();
+                return null;
+            }
+        }
+        
+        public DockerBuilder script(String script){
+            this.script = script;
+            return this;
+        }
+
+        public DockerBuilder container(String container){
+            this.container = container;
+            return this;
+        }
+
+        public DockerBuilder exec(){
+            this.exec = true;
+            return this;
+        }        
+        public Docker build(){
+
+            ArrayList<String> list = new ArrayList<>();
+            list.add("docker");
+            if(exec){
+                list.add("exec");
+
+            }
+            
+            if (container == null || container.isEmpty()){
+                throw new RuntimeException("container should be set");
+            }
+            list.add(container);
+            
+            if (script == null || script.isEmpty()){
+                throw new RuntimeException("script should be set");
+            }
+            list.add(script);
+
+            
+            return new Docker(list);
+        }
+    }
+       
+    Docker(List<String> cmd) {
+       super(cmd);
+    }
+
+}