Skip to content

Commit 2d68657

Browse files
mbwhitembwhite
committed
Backport the Integration Changes
Signed-off-by: Matthew B White <[email protected]>
1 parent 8369b36 commit 2d68657

File tree

152 files changed

+669
-2595
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+669
-2595
lines changed

‎.github/workflows/build.yml

+47-26
Original file line numberDiff line numberDiff line change
@@ -55,35 +55,56 @@ jobs:
5555
cache: 'gradle'
5656
- name: Validate Gradle wrapper
5757
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
58-
- name: Build with Gradle
58+
- name: Dependency Check
5959
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
6060
with:
61-
arguments: build
62-
- name: Create artifacts
63-
env:
64-
SIGNING_ID: ${{ secrets.SIGNING_ID }}
65-
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
66-
KEYRING_FILE: ${{ secrets.KEYRING_FILE }}
67-
run: |
68-
set -xev
69-
70-
echo $KEYRING_FILE > keyringfile.gpg
71-
./gradlew -Psigning.keyId=${SIGNING_ID} -Psigning.password=${SIGNING_PASSWORD} -Psigning.secretKeyRingFile=keyringfile.gpg publishShimJarPublicationToMavenLocal
72-
73-
tar -zcvf localmaven.tgz ${HOME}/.m2/repository/org/hyperledger
74-
docker image save hyperledger/fabric-javaenv | gzip > fabric-javaenv.tar.gz
75-
- name: Upload Docker image
76-
uses: actions/upload-artifact@v3
77-
with:
78-
name: javaenv-docker-image
79-
path: |
80-
fabric-javaenv.tar.gz
81-
- name: Upload JARs tgz
82-
uses: actions/upload-artifact@v3
61+
arguments: |
62+
:fabric-chaincode-shim:dependencyCheckAnalyze
63+
- name: Build and Unit test
64+
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
8365
with:
84-
name: Java JARs
85-
path: |
86-
localmaven.tgz
66+
arguments: |
67+
:fabric-chaincode-shim:build
68+
-xdependencyCheckAnalyze
69+
70+
intergationtest:
71+
runs-on: ubuntu-latest
72+
steps:
73+
- uses: actions/checkout@v3
74+
- uses: actions/setup-java@v3
75+
with:
76+
distribution: 'temurin'
77+
java-version: '11'
78+
cache: 'gradle'
79+
80+
- name: Populate chaincode with latest java-version
81+
run: |
82+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/repository publishShimJarPublicationToFabricRepository
83+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/repository publishShimJarPublicationToFabricRepository
84+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-gradle/repository publishShimJarPublicationToFabricRepository
85+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-maven/repository publishShimJarPublicationToFabricRepository
86+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/wrapper-maven/repository publishShimJarPublicationToFabricRepository
87+
88+
89+
- name: Ensure that the Peer/weft tools are available
90+
run: |
91+
curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary
92+
npm install -g @hyperledger-labs/weft
93+
94+
# set the path and cfg env var for the rest of the step
95+
echo "FABRIC_CFG_PATH=$GITHUB_WORKSPACE/config" >> $GITHUB_ENV
96+
echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH
97+
- name: versions
98+
run: |
99+
peer version
100+
weft --version
101+
- name: Integration Tests
102+
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
103+
with:
104+
arguments: |
105+
:fabric-chaincode-integration-test:build
106+
-xdependencyCheckAnalyze
107+
87108

88109
publishjars:
89110
runs-on: ubuntu-latest

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
/build/
99
build/*
1010

11+
_cfg
12+
repository
13+
1114
.env
1215

1316
.gradle

‎ci/azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ stages:
6464
javaHomeOption: "JDKVersion"
6565
jdkVersionOption: "1.8"
6666
jdkArchitectureOption: "x64"
67-
options: "-x javadoc"
67+
options: "-x javadoc -x :fabric-chaincode-integration-test:test"
6868
publishJUnitResults: true
6969
testResultsFiles: "$(System.DefaultWorkingDirectory)/**/TEST-*.xml"
7070
tasks: "build"

‎fabric-chaincode-integration-test/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
repository
2+
_cfg
3+
*.tar.gz

‎fabric-chaincode-integration-test/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,3 @@ task getLatestDockerImages{
2929
}
3030
}
3131
}
32-
33-
build.dependsOn project(':fabric-chaincode-docker').buildImage
34-
35-
test.dependsOn project.getLatestDockerImages
36-

‎fabric-chaincode-integration-test/chaincodebootstrap.gradle

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
allprojects {
2+
apply plugin: 'maven-publish'
3+
4+
publishing {
5+
repositories {
6+
maven {
7+
name = 'fabric'
8+
url = "file:$chaincodeRepoDir"
9+
}
10+
}
11+
}
12+
}

‎fabric-chaincode-integration-test/getDockerImages.sh

-19
This file was deleted.

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

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ repositories {
1212
mavenLocal()
1313
mavenCentral()
1414
maven { url = "https://www.jitpack.io" }
15+
maven {
16+
url "$projectDir/repository"
17+
}
1518
}
1619

1720
dependencies {

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@
3232
<repository>
3333
<id>artifactory</id>
3434
<url>https://hyperledger.jfrog.io/hyperledger/fabric-maven</url>
35-
</repository>
35+
</repository>
36+
<repository>
37+
<id>localfabirc</id>
38+
<url>file://${project.basedir}/repository</url>
39+
</repository>
3640
</repositories>
3741

3842
<dependencies>

‎fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ repositories {
1212
mavenLocal()
1313
mavenCentral()
1414
maven { url = "https://www.jitpack.io" }
15+
maven {
16+
url "$projectDir/repository"
17+
}
1518
}
1619

1720
dependencies {

‎fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ repositories {
1212
mavenLocal()
1313
mavenCentral()
1414
maven { url = "https://www.jitpack.io" }
15+
maven {
16+
url "$projectDir/repository"
17+
}
1518
}
1619

1720
dependencies {

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

+4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
<id>artifactory</id>
3434
<url>https://hyperledger.jfrog.io/hyperledger/fabric-maven</url>
3535
</repository>
36+
<repository>
37+
<id>localfabric</id>
38+
<url>file://${project.basedir}/repository</url>
39+
</repository>
3640
</repositories>
3741

3842
<dependencies>

‎fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/contractinstall/ContractInstallTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@ public class ContractInstallTest {
2121
@BeforeClass
2222
public static void setUp() throws Exception {
2323
FabricState.getState().start();
24-
FabricState.getState().startChannel("sachannel");
24+
2525
}
2626

2727
@Test
2828
public void TestInstall(){
2929

3030
InvokeHelper helper = InvokeHelper.newHelper("baregradlecc","sachannel");
31-
String text = helper.invoke(new String[]{"whoami"});
31+
String text = helper.invoke("org1",new String[]{"whoami"});
3232
assertThat(text, containsString("BareGradle"));
3333

3434
helper = InvokeHelper.newHelper("baremaven","sachannel");
35-
text = helper.invoke(new String[]{"whoami"});
35+
text = helper.invoke("org1",new String[]{"whoami"});
3636
assertThat(text, containsString("BareMaven"));
3737

3838
helper = InvokeHelper.newHelper("wrappermaven","sachannel");
39-
text = helper.invoke(new String[]{"whoami"});
39+
text = helper.invoke("org1",new String[]{"whoami"});
4040
assertThat(text, containsString("WrapperMaven"));
4141
}
4242

‎fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/ledgertests/LedgerIntegrationTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@ public class LedgerIntegrationTest {
2020

2121
@BeforeClass
2222
public static void setUp() throws Exception {
23+
24+
2325
FabricState.getState().start();
24-
FabricState.getState().startChannel("sachannel");
2526
}
2627

2728
@Test
2829
public void TestLedgers(){
2930
InvokeHelper helper = InvokeHelper.newHelper("ledgercc","sachannel");
3031

31-
String text = helper.invoke(new String[]{"accessLedgers"});
32+
String text = helper.invoke("org1",new String[]{"accessLedgers"});
3233
assertThat(text, containsString("success"));
3334

3435
}

‎fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SACCIntegrationTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@ public class SACCIntegrationTest {
2121
@BeforeClass
2222
public static void setUp() throws Exception {
2323
FabricState.getState().start();
24-
FabricState.getState().startChannel("sachannel");
24+
2525
}
2626

2727
@Test
2828
public void TestLedger(){
2929

3030
InvokeHelper helper = InvokeHelper.newHelper("shimcc", "sachannel");
31-
String text = helper.invoke(new String[]{"putBulkStates"});
31+
String text = helper.invoke("org1",new String[]{"putBulkStates"});
3232
assertThat(text, containsString("success"));
3333

34-
text = helper.invoke(new String[]{"getByRange","key120","key170"});
34+
text = helper.invoke("org1",new String[]{"getByRange","key120","key170"});
3535
assertThat(text, containsString("50"));
3636

37-
text = helper.invoke(new String[]{"getByRangePaged","key120","key170","10",""});
37+
text = helper.invoke("org1",new String[]{"getByRangePaged","key120","key170","10",""});
3838
System.out.println(text);
3939
assertThat(text, containsString("key130"));
4040

41-
text = helper.invoke(new String[]{"getMetricsProviderName"});
41+
text = helper.invoke("org1",new String[]{"getMetricsProviderName"});
4242
System.out.println(text);
4343
assertThat(text, containsString("org.hyperledger.fabric.metrics.impl.DefaultProvider"));
4444
}

0 commit comments

Comments
 (0)