Skip to content

Commit bf5ac7a

Browse files
committed
Massive update to intergation test
Signed-off-by: Matthew B White <[email protected]>
1 parent 0fb6d7e commit bf5ac7a

File tree

153 files changed

+662
-2574
lines changed

Some content is hidden

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

153 files changed

+662
-2574
lines changed

.github/workflows/build.yml

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,43 @@ jobs:
3333
arguments: |
3434
:fabric-chaincode-shim:build
3535
-xdependencyCheckAnalyze
36-
- name: Integration Tests
37-
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
38-
with:
36+
37+
intergationtest:
38+
runs-on: ubuntu-latest
39+
steps:
40+
- uses: actions/checkout@v3
41+
- uses: actions/setup-java@v3
42+
with:
43+
distribution: 'temurin'
44+
java-version: '11'
45+
cache: 'gradle'
46+
47+
- name: Populate chaincode with latest java-version
48+
run: |
49+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/repository publishShimJarPublicationToFabricRepository
50+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/repository publishShimJarPublicationToFabricRepository
51+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-gradle/repository publishShimJarPublicationToFabricRepository
52+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-maven/repository publishShimJarPublicationToFabricRepository
53+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/wrapper-maven/repository publishShimJarPublicationToFabricRepository
54+
55+
56+
- name: Ensure that the Peer/weft tools are available
57+
run: |
58+
curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary
59+
npm install -g @hyperledger-labs/weft
60+
61+
# set the path and cfg env var for the rest of the step
62+
echo "FABRIC_CFG_PATH=$GITHUB_WORKSPACE/config" >> $GITHUB_ENV
63+
echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH
64+
- name: versions
65+
run: |
66+
peer version
67+
weft --version
68+
- name: Integration Tests
69+
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
70+
with:
3971
arguments: |
4072
:fabric-chaincode-integration-test:build
4173
-xdependencyCheckAnalyze
74+
75+

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@
88
/build/
99
build/*
1010

11-
.env
11+
_cfg
12+
repository
1213

14+
.env
15+
config
1316
.gradle
1417
/build/
1518
out/
@@ -44,3 +47,4 @@ gradle.properties
4447
### Jekyll ###
4548
.sass-cache
4649
_site
50+

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@ def getDate() {
7171
def date = new Date()
7272
def formattedDate = date.format('yyyyMMdd')
7373
return formattedDate
74-
}
74+
}

ci/azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
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"
Lines changed: 3 additions & 0 deletions
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

Lines changed: 0 additions & 5 deletions
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-
Lines changed: 12 additions & 0 deletions
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

Lines changed: 0 additions & 19 deletions
This file was deleted.

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

Lines changed: 3 additions & 0 deletions
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

Lines changed: 5 additions & 1 deletion
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>

0 commit comments

Comments
 (0)