Explicit trigger for PR builds (#43)

Also:
- Use public Fabric 2.0 Docker images
- Depend on fabric-shim 2.0.0 in test Node chaincode

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>

Author: bestbeforetoday

azure-pipelines.yml

@@ -4,31 +4,22 @@
 # https://docs.microsoft.com/azure/devops/pipelines/languages/java
 
 trigger:
-- master
+  - master
+
+pr:
+  - master
 
 pool:
-  vmImage: 'ubuntu-latest'
+  vmImage: 'ubuntu-18.04'
 
 jobs:
-- job: test
-  steps:
-    - script: |
-        set -eo pipefail
-        export ORG_HYPERLEDGER_FABRIC_SDKTEST_FIXVERSION=2.0
-        export ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION=2.0.0
-        export IMAGE_TAG_FABRIC=2.0
-        export IMAGE_TAG_FABRIC_CA=2.0
-        ########################
-        # Pull nodenev image from Artifactory and re-tag to hyperledger/fabric-nodeenv
-        #######################
-        docker pull hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.0.0-stable
-        docker tag hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv:amd64-latest
-        docker tag hyperledger-fabric.jfrog.io/fabric-nodeenv:amd64-2.0.0-stable hyperledger/fabric-nodeenv
-        docker pull hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.0.0-stable
-        docker tag hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv:amd64-latest
-        docker tag hyperledger-fabric.jfrog.io/fabric-javaenv:amd64-2.0.0-stable hyperledger/fabric-javaenv
-        ##########
-        docker images | grep hyperledger/fabric-nodeenv || true
-        source ./src/test/fabric_test_commitlevel.sh
-        ./src/test/pull_images.sh
-        WD=$PWD GOPATH=$PWD/src/test/fixture ./src/test/cirun.sh
+  - job: test
+    steps:
+      - script: |
+          set -eo pipefail
+          export ORG_HYPERLEDGER_FABRIC_SDKTEST_FIXVERSION=2.0
+          export ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION=2.0.0
+          export IMAGE_TAG_FABRIC=2.0
+          export IMAGE_TAG_FABRIC_CA=2.0
+          source ./src/test/fabric_test_commitlevel.sh
+          WD=$PWD GOPATH=$PWD/src/test/fixture ./src/test/cirun.sh

src/test/fixture/sdkintegration/.env

@@ -49,15 +49,15 @@ ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CLIENT_AUTH_REQUIRED=false
 #IMAGE_TAG_FABRIC_CA=:1.4
 
 ##V 2.0
-# FAB_CONFIG_GEN_VERS=v2.0
-# V11_IDENTITIES_ALLOWREMOVE=--cfg.identities.allowremove
-# V11_AFFILIATIONS_ALLOWREMOVE=--cfg.affiliations.allowremove
-# IMAGE_TAG_FABRIC=:2.0
-# IMAGE_TAG_FABRIC_CA=:2.0
-
-## Latest
 FAB_CONFIG_GEN_VERS=v2.0
 V11_IDENTITIES_ALLOWREMOVE=--cfg.identities.allowremove
 V11_AFFILIATIONS_ALLOWREMOVE=--cfg.affiliations.allowremove
-IMAGE_TAG_FABRIC=
-IMAGE_TAG_FABRIC_CA=
+IMAGE_TAG_FABRIC=:2.0
+IMAGE_TAG_FABRIC_CA=:latest
+
+## Latest
+#FAB_CONFIG_GEN_VERS=v2.0
+#V11_IDENTITIES_ALLOWREMOVE=--cfg.identities.allowremove
+#V11_AFFILIATIONS_ALLOWREMOVE=--cfg.affiliations.allowremove
+#IMAGE_TAG_FABRIC=
+#IMAGE_TAG_FABRIC_CA=

src/test/fixture/sdkintegration/nodecc/sample1/package.json

@@ -0,0 +1,18 @@
+{
+    "name": "example_cc",
+    "version": "1.0.0",
+    "description": "",
+    "main": "chaincode.js",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1",
+        "start": "node chaincode.js"
+    },
+    "author": {
+        "name": "hyperledger/fabric",
+        "email": "fabric@lists.hyperledger.org"
+    },
+    "license": "Apache-2.0",
+    "dependencies": {
+        "fabric-shim": "2.0.0"
+    }
+}

src/test/fixture/sdkintegration/nodecc/sample1/package.json.TEMPLATE

@@ -0,0 +1,18 @@
+{
+    "name": "example_cc",
+    "version": "1.0.0",
+    "description": "",
+    "main": "chaincode.js",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1",
+        "start": "node chaincode.js"
+    },
+    "author": {
+        "name": "hyperledger/fabric",
+        "email": "fabric@lists.hyperledger.org"
+    },
+    "license": "Apache-2.0",
+    "dependencies": {
+        "fabric-shim": "2.0.0"
+    }
+}

src/test/fixture/sdkintegration/nodecc/sample_11/package.json

@@ -211,33 +211,8 @@ private TestConfig() {
 
                     sampleOrg.setCAProperties(properties);
                 }
-
-                //FIX Node chaincode to reference chaincode shim package according to fabric version.
-
-                String ncCv = 2 == fabricVersion[0] ? "\"unstable\"" : String.format("\"~%d.%d.0\"", fabricVersion[0], fabricVersion[1]);
-
-                try {
-                    List<Path> collect = null;
-                    try (Stream<Path> filess = Files.walk(Paths.get("src/test/fixture/sdkintegration/nodecc"))) {
-                        collect = filess.filter(f -> f.getFileName().toString().equals("package.json.TEMPLATE"))
-                                .collect(Collectors.toList());
-                    }
-
-                    for (Path jspf : collect) {
-                        String jpff = new String(Files.readAllBytes(jspf)).replaceAll(Pattern.quote("${1}"), ncCv).replaceAll("(?m)^#.*$\n", "");
-                        Path pkgjson = Paths.get(jspf.getParent().toFile().getAbsolutePath(), "package.json");
-                        pkgjson.toFile().deleteOnExit();
-                        Files.write(pkgjson, jpff.getBytes(StandardCharsets.UTF_8), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE);
-                    }
-
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-
             }
-
         }
-
     }
 
     public String getFabricConfigGenVers() {