Backport the Integration Changes

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

Author: mbwhite

.github/workflows/build.yml

@@ -55,35 +55,56 @@ jobs:
         cache: 'gradle'
     - name: Validate Gradle wrapper
       uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
-    - name: Build with Gradle
+    - name: Dependency Check
       uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
       with:
-        arguments: build        
-    - name: Create artifacts
-      env:
-        SIGNING_ID: ${{ secrets.SIGNING_ID }}
-        SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
-        KEYRING_FILE: ${{ secrets.KEYRING_FILE }}
-      run: |
-        set -xev
-        
-        echo $KEYRING_FILE > keyringfile.gpg
-        ./gradlew -Psigning.keyId=${SIGNING_ID} -Psigning.password=${SIGNING_PASSWORD} -Psigning.secretKeyRingFile=keyringfile.gpg publishShimJarPublicationToMavenLocal
-        
-        tar -zcvf localmaven.tgz ${HOME}/.m2/repository/org/hyperledger
-        docker image save hyperledger/fabric-javaenv | gzip > fabric-javaenv.tar.gz
-    - name: Upload Docker image
-      uses: actions/upload-artifact@v3
-      with:
-        name: javaenv-docker-image
-        path: |
-          fabric-javaenv.tar.gz
-    - name: Upload JARs tgz
-      uses: actions/upload-artifact@v3
+          arguments: |
+            :fabric-chaincode-shim:dependencyCheckAnalyze
+    - name: Build and Unit test
+      uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
       with:
-        name: Java JARs
-        path: |
-          localmaven.tgz
+          arguments: |
+            :fabric-chaincode-shim:build 
+            -xdependencyCheckAnalyze      
+    
+  intergationtest:  
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+          cache: 'gradle'
+
+      - name: Populate chaincode with latest java-version
+        run: |
+          ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/repository publishShimJarPublicationToFabricRepository
+          ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/repository publishShimJarPublicationToFabricRepository
+          ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-gradle/repository publishShimJarPublicationToFabricRepository
+          ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-maven/repository publishShimJarPublicationToFabricRepository
+          ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/wrapper-maven/repository publishShimJarPublicationToFabricRepository
+
+
+      - name: Ensure that the Peer/weft tools are available
+        run: |
+          curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary
+          npm install -g @hyperledger-labs/weft
+          
+          # set the path and cfg env var for the rest of the step
+          echo "FABRIC_CFG_PATH=$GITHUB_WORKSPACE/config" >> $GITHUB_ENV
+          echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH
+      - name: versions
+        run: |
+          peer version
+          weft --version
+      - name: Integration Tests
+        uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
+        with:
+          arguments: |
+            :fabric-chaincode-integration-test:build 
+            -xdependencyCheckAnalyze 
+  
 
   publishjars:
     runs-on: ubuntu-latest

.gitignore

@@ -8,6 +8,9 @@
 /build/
 build/*
 
+_cfg
+repository
+
 .env
 
 .gradle

ci/azure-pipelines.yml

@@ -64,7 +64,7 @@ stages:
               javaHomeOption: "JDKVersion"
               jdkVersionOption: "1.8"
               jdkArchitectureOption: "x64"
-              options: "-x javadoc"
+              options: "-x javadoc -x :fabric-chaincode-integration-test:test"
               publishJUnitResults: true
               testResultsFiles: "$(System.DefaultWorkingDirectory)/**/TEST-*.xml"
               tasks: "build"

fabric-chaincode-integration-test/.gitignore

@@ -0,0 +1,3 @@
+repository
+_cfg
+*.tar.gz

fabric-chaincode-integration-test/build.gradle

@@ -29,8 +29,3 @@ task getLatestDockerImages{
         }
     }
 }
-
-build.dependsOn project(':fabric-chaincode-docker').buildImage
-
-test.dependsOn project.getLatestDockerImages
-

fabric-chaincode-integration-test/chaincodebootstrap.gradle

@@ -0,0 +1,12 @@
+allprojects {
+    apply plugin: 'maven-publish'
+
+    publishing {
+        repositories {
+            maven {
+                name = 'fabric'
+                url = "file:$chaincodeRepoDir"
+            }
+        }
+    }
+}

fabric-chaincode-integration-test/getDockerImages.sh

@@ -12,6 +12,9 @@ repositories {
     mavenLocal()
     mavenCentral()
     maven { url = "https://www.jitpack.io" }
+    maven {
+      url "$projectDir/repository"
+    }
 }
 
 dependencies {

fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle

@@ -32,7 +32,11 @@
 		<repository>
             <id>artifactory</id>
             <url>https://hyperledger.jfrog.io/hyperledger/fabric-maven</url>
-        </repository>		
+        </repository>	
+		<repository>
+			<id>localfabirc</id>
+			<url>file://${project.basedir}/repository</url>
+		</repository>			
     </repositories>
 
 	<dependencies>

fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml

@@ -12,6 +12,9 @@ repositories {
     mavenLocal()
     mavenCentral()
     maven { url = "https://www.jitpack.io" }
+    maven {
+      url "$projectDir/repository"
+    }
 }
 
 dependencies {