Skip to content

Commit

Permalink
[FAB-9229] Enable CI target for Fabric 1.2
Browse files Browse the repository at this point in the history
Change-Id: I73a5bebf75b25b5e15107c8ddd6b00c91d7500dd
Signed-off-by: Troy Ronda <[email protected]>
  • Loading branch information
troyronda committed Mar 29, 2018
1 parent 213899c commit 429e1ef
Show file tree
Hide file tree
Showing 13 changed files with 160 additions and 11 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ FABRIC_BASEIMAGE_STABLE_VERSION := 0.4.6

FABRIC_PRERELEASE_VERSION := 1.1.0
FABRIC_PREV_VERSION := 1.0.6
FABRIC_DEVSTABLE_VERSION_MINOR := 1.1
FABRIC_DEVSTABLE_VERSION_MINOR := 1.2
FABRIC_DEVSTABLE_VERSION_MAJOR := 1
FABRIC_PREV_VERSION_MINOR := 1.0

Expand Down Expand Up @@ -89,7 +89,7 @@ FABRIC_DEVSTABLE_INTTEST ?= false
FABRIC_STABLE_CODELEVEL_TAG := stable
FABRIC_PREV_CODELEVEL_TAG := prev
FABRIC_PRERELEASE_CODELEVEL_TAG := prerelease
FABRIC_DEVSTABLE_CODELEVEL_TAG := devstable
FABRIC_DEVSTABLE_CODELEVEL_TAG := latest
FABRIC_CODELEVEL_TAG ?= $(FABRIC_STABLE_CODELEVEL_TAG)

# Code level version targets
Expand Down Expand Up @@ -127,7 +127,7 @@ endif
FABRIC_TOOLS_STABLE_TAG := $(ARCH)-$(FABRIC_STABLE_VERSION)
FABRIC_TOOLS_PREV_TAG := $(ARCH)-$(FABRIC_PREV_VERSION)
FABRIC_TOOLS_PRERELEASE_TAG := $(ARCH)-$(FABRIC_PRERELEASE_VERSION)
FABRIC_TOOLS_DEVSTABLE_TAG := DEV_STABLE
FABRIC_TOOLS_DEVSTABLE_TAG := latest

# The version of dep that will be installed by depend-install (or in the CI)
GO_DEP_COMMIT := v0.4.1
Expand All @@ -143,7 +143,7 @@ FABRIC_STABLE_PKCS11_INTTEST := true
FABRIC_STABLE_REVOKED_INTTEST := true
FABRIC_PREV_INTTEST := true
FABRIC_PRERELEASE_INTTEST := false
FABRIC_DEVSTABLE_INTTEST := false
FABRIC_DEVSTABLE_INTTEST := true
endif

# Setup Go Tags
Expand Down Expand Up @@ -249,7 +249,7 @@ integration-tests-devstable: clean depend populate
@. $(FIXTURE_DOCKERENV_PATH)/devstable-env.sh && \
$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
cd $(FIXTURE_DOCKERENV_PATH) && \
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_DEVSTABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_DEVSTABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY)/ $(DOCKER_COMPOSE_CMD) -f docker-compose.yaml -f docker-compose-nopkcs11-test.yaml up --force-recreate --abort-on-container-exit
FABRIC_FIXTURE_VERSION=v$(FABRIC_DEVSTABLE_VERSION_MINOR) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_DEVSTABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_DEVSTABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY)/ $(DOCKER_COMPOSE_CMD) -f docker-compose.yaml -f docker-compose-nopkcs11-test.yaml up --force-recreate --abort-on-container-exit
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY)/ $(FIXTURE_SCRIPTS_PATH)/check_status.sh "-f ./docker-compose.yaml -f ./docker-compose-nopkcs11-test.yaml"

.PHONY: integration-tests-stable-revoked
Expand Down
12 changes: 6 additions & 6 deletions test/fixtures/dockerenv/devstable-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
export ARCH=""
export ARCH_SEP=""

export FABRIC_FIXTURE_VERSION="v1.1"
export FABRIC_FIXTURE_VERSION="v1.2"
export FABRIC_CRYPTOCONFIG_VERSION="v1"

export FABRIC_CA_FIXTURE_TAG="DEV_STABLE"
export FABRIC_ORDERER_FIXTURE_TAG="DEV_STABLE"
export FABRIC_PEER_FIXTURE_TAG="DEV_STABLE"
export FABRIC_COUCHDB_FIXTURE_TAG="DEV_STABLE"
export FABRIC_BUILDER_FIXTURE_TAG="DEV_STABLE"
export FABRIC_CA_FIXTURE_TAG="latest"
export FABRIC_ORDERER_FIXTURE_TAG="latest"
export FABRIC_PEER_FIXTURE_TAG="latest"
export FABRIC_COUCHDB_FIXTURE_TAG="latest"
export FABRIC_BUILDER_FIXTURE_TAG="latest"

# override SDK configuration that loads crypto-config
export FABRIC_SDK_CLIENT_CRYPTOCONFIG_PATH='${GOPATH}'"/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabric/${FABRIC_CRYPTOCONFIG_VERSION}/crypto-config"
Expand Down
Binary file added test/fixtures/fabric/v1.2/channel/mychannel.tx
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added test/fixtures/fabric/v1.2/channel/orgchannel.tx
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added test/fixtures/fabric/v1.2/channel/testchannel.tx
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
149 changes: 149 additions & 0 deletions test/fixtures/fabric/v1.2/config/configtx.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#

---
################################################################################
#
# Profile
#
# - Different configuration profiles may be encoded here to be specified
# as parameters to the configtxgen tool
#
################################################################################
Profiles:

TwoOrgsOrdererGenesis:
Orderer:
<<: *OrdererDefaults
Organizations:
- *OrdererOrg
Consortiums:
SampleConsortium:
Organizations:
- *org1
- *org2
TwoOrgsChannel:
Consortium: SampleConsortium
Application:
<<: *ApplicationDefaults
Organizations:
- *org1
- *org2

################################################################################
#
# Section: Organizations
#
# - This section defines the different organizational identities which will
# be referenced later in the configuration.
#
################################################################################
Organizations:

# SampleOrg defines an MSP using the sampleconfig. It should never be used
# in production but may be used as a template for other definitions
- &OrdererOrg
# DefaultOrg defines the organization which is used in the sampleconfig
# of the fabric.git development environment
Name: OrdererMSP

# ID to load the MSP definition as
ID: OrdererMSP

# MSPDir is the filesystem path which contains the MSP configuration
MSPDir: ../../v1/crypto-config/ordererOrganizations/example.com/msp

- &org1
# DefaultOrg defines the organization which is used in the sampleconfig
# of the fabric.git development environment
Name: Org1MSP

# ID to load the MSP definition as
ID: Org1MSP

MSPDir: ../../v1/crypto-config/peerOrganizations/org1.example.com/msp

AnchorPeers:
# AnchorPeers defines the location of peers which can be used
# for cross org gossip communication. Note, this value is only
# encoded in the genesis block in the Application section context
- Host: peer0.org1.example.com
Port: 7051

- &org2
# DefaultOrg defines the organization which is used in the sampleconfig
# of the fabric.git development environment
Name: Org2MSP

# ID to load the MSP definition as
ID: Org2MSP

MSPDir: ../../v1/crypto-config/peerOrganizations/org2.example.com/msp

AnchorPeers:
# AnchorPeers defines the location of peers which can be used
# for cross org gossip communication. Note, this value is only
# encoded in the genesis block in the Application section context
- Host: peer0.org2.example.com
Port: 8051

################################################################################
#
# SECTION: Orderer
#
# - This section defines the values to encode into a config transaction or
# genesis block for orderer related parameters
#
################################################################################
Orderer: &OrdererDefaults

# Orderer Type: The orderer implementation to start
# Available types are "solo" and "kafka"
OrdererType: solo

Addresses:
- orderer.example.com:7050

# Batch Timeout: The amount of time to wait before creating a batch
BatchTimeout: 2s

# Batch Size: Controls the number of messages batched into a block
BatchSize:

# Max Message Count: The maximum number of messages to permit in a batch
MaxMessageCount: 10

# Absolute Max Bytes: The absolute maximum number of bytes allowed for
# the serialized messages in a batch.
AbsoluteMaxBytes: 98 MB

# Preferred Max Bytes: The preferred maximum number of bytes allowed for
# the serialized messages in a batch. A message larger than the preferred
# max bytes will result in a batch larger than preferred max bytes.
PreferredMaxBytes: 512 KB

Kafka:
# Brokers: A list of Kafka brokers to which the orderer connects
# NOTE: Use IP:port notation
Brokers:
- 127.0.0.1:9092

# Organizations is the list of orgs which are defined as participants on
# the orderer side of the network
Organizations:

################################################################################
#
# SECTION: Application
#
# - This section defines the values to encode into a config transaction or
# genesis block for application related parameters
#
################################################################################
Application: &ApplicationDefaults

# Organizations is the list of orgs which are defined as participants on
# the application side of the network
Organizations:

0 comments on commit 429e1ef

Please sign in to comment.