Skip to content

Integration test overhaul (backport #277) - #278

Closed
mergify[bot] wants to merge 2 commits into
release-2.5from
mergify/bp/release-2.5/pr-277
Closed

mergify[bot] wants to merge 2 commits into
release-2.5from
mergify/bp/release-2.5/pr-277

Conversation

@mergify

@mergify mergify Bot commented Jan 13, 2023

Copy link
Copy Markdown

This is an automatic backport of pull request #277 done by Mergify.
Cherry-pick of 0fb6d7e has failed:

On branch mergify/bp/release-2.5/pr-277
Your branch is up to date with 'origin/release-2.5'.

You are currently cherry-picking commit 0fb6d7e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   fabric-chaincode-shim/build.gradle

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/build.yml

Cherry-pick of bf5ac7a has failed:

On branch mergify/bp/release-2.5/pr-277
Your branch is ahead of 'origin/release-2.5' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit bf5ac7a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .gitignore
	modified:   build.gradle
	modified:   ci/azure-pipelines.yml
	new file:   fabric-chaincode-integration-test/.gitignore
	modified:   fabric-chaincode-integration-test/build.gradle
	new file:   fabric-chaincode-integration-test/chaincodebootstrap.gradle
	modified:   fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle
	modified:   fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml
	modified:   fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle
	modified:   fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle
	modified:   fabric-chaincode-integration-test/src/contracts/wrapper-maven/pom.xml
	modified:   fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/contractinstall/ContractInstallTest.java
	modified:   fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/ledgertests/LedgerIntegrationTest.java
	modified:   fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SACCIntegrationTest.java
	modified:   fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SBECCIntegrationTest.java
	new file:   fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Bash.java
	modified:   fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Command.java
	modified:   fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/FabricState.java
	modified:   fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/InvokeHelper.java
	modified:   fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Peer.java
	deleted:    fabric-chaincode-integration-test/src/test/resources/chaincodeendorsementpolicy.yaml
	deleted:    fabric-chaincode-integration-test/src/test/resources/chaincodeendorsementpolicy_2orgs.yaml
	deleted:    fabric-chaincode-integration-test/src/test/resources/collection_config.yaml
	new file:   fabric-chaincode-integration-test/src/test/resources/docker-compose-microfab.yaml
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/.env
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/base/docker-compose-base.yaml
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/base/peer-base.yaml
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/genesis.block
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sachannel.tx
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sachannelOrg1MSPanchors.tx
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sachannelOrg2MSPanchors.tx
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sbechannel.tx
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sbechannelOrg1MSPanchors.tx
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sbechannelOrg2MSPanchors.tx
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/configtx.yaml
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config.yaml
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/ca/dc0e794b1091c43ef16457414e1371e71b898d2462a9ac0f928af8e13a060bb7_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/9532dfa1f6fd6f195b538dad5e3d5df1715a0b545c17308a1de0dd9d19a014da_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/tlsca/f385781620bf864bdfaf3744c2a6bc714704defc46cd7cd2f014eca48fba85e9_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/b0b3c309a7d201898f6572bd1381220cf4bb57f3d43349b91b46cbe02b010c17_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/ca/4d1dfcb3e47e5a89357d7cda73bf8c3bb620cc571007f5b68e1f6a0766258005_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/config.yaml
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/config.yaml
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/87169e9fbaf4a3e33b2d169bdf8cef41f90e1f1836e8dc9b304bd0e0e15de4cd_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/config.yaml
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/540b89c87b4e781e9e43230c0f9c790d8c00057e755969f9309c28cc0d629eda_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/tlsca/4fc0ed49a8f31cf626cb9199b7677303cb6922a5ce722cd8f4ef6e92a346d59c_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/23acbdca52b60346fb189be8846f5799b379fcd582bdde8230641ff2eb2ae883_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/06598da2a5c8268d5e09ff090136c411392fe5af949354b05a5bd8041ec1f8a5_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/ca/f5e00e1f9abb3291ea35970c6123e93873dddce1e548f386f96856e9ccf168c1_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/config.yaml
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/config.yaml
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/983726350b06050b9073348da249b99bb6d57333d4a46c27b0d2062f5e8167e6_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/config.yaml
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/6259fa0caff41fc0fd8a2b16e46742f8831e3411f7130444515875bcdf6297e2_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/tlsca/9eb5d2f5eaf8a4b33883b34393561b3be6922e4a42cf29fdad22788b747985d7_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/73b84d0e0bb0c31d6eb40d6054811b2c7764059e95831bb0ed160f79f3a3794e_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.key
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/f0cbbe6fb24330132e15fd0f56296d497f9a450341b3d39a42d1d86ba3e285c4_sk
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.crt
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.key
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/docker-compose-cli.yaml
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/scripts/capabilities.json
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/scripts/collection_config.json
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/scripts/script.sh
	deleted:    fabric-chaincode-integration-test/src/test/resources/first-network/scripts/utils.sh
	new file:   fabric-chaincode-integration-test/src/test/resources/scripts/ccutils.sh
	new file:   fabric-chaincode-integration-test/src/test/resources/scripts/collection_config.json
	new file:   fabric-chaincode-integration-test/src/test/resources/scripts/mfsetup.sh

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/build.yml
	deleted by them: fabric-chaincode-integration-test/getDockerImages.sh

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
(cherry picked from commit 0fb6d7e)

# Conflicts:
#	.github/workflows/build.yml
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
(cherry picked from commit bf5ac7a)

# Conflicts:
#	.github/workflows/build.yml
#	fabric-chaincode-integration-test/getDockerImages.sh
@mergify
mergify Bot requested a review from a team as a code owner January 13, 2023 08:34
@mergify mergify Bot added the conflicts label Jan 13, 2023
@mergify mergify Bot mentioned this pull request Jan 13, 2023
@sonarqubecloud

Copy link
Copy Markdown

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@mbwhite mbwhite closed this Jan 13, 2023
@mergify
mergify Bot deleted the mergify/bp/release-2.5/pr-277 branch January 13, 2023 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant