Skip to content

GitLab

Commit 85ef0832 authored by Christopher Ferris's avatar Christopher Ferris
Browse files

FAB-4380 prepare for 1.0.0-beta release 



modified scripts/changelog.sh to be used with the
release prepare commit
CHANGELOG.md updated

amended e2e_cli scripts to remove bootstrap.sh and
update the rst to and download_dockerimages.sh to reflect beta release
add tools image
make check_spelling.sh return 0 always and bypass CHANGELOG
change end-to-end.rst to use 'make release' - no need to
build other architectures
add missing license headers
update changelog
fix goimports error
rebased and updated CHANGELOG

Change-Id: I7b27083ff570d66e1b57000af075bb4cddfd1c3c
Signed-off-by: default avatarChristopher Ferris <chrisfer@us.ibm.com>
parent d25b9945
Expand all Hide whitespace changes
Inline Side-by-side
CHANGELOG.md
View file @ 85ef0832
This diff is collapsed.
Makefile
View file @ 85ef0832
......@@ -34,9 +34,9 @@
# - unit-test-clean - cleans unit test state (particularly from docker)
PROJECT_NAME = hyperledger/fabric
BASE_VERSION = 1.0.0-alpha3
BASE_VERSION = 1.0.0-beta
PREV_VERSION = 1.0.0-alpha2
IS_RELEASE = false
IS_RELEASE = true
ifneq ($(IS_RELEASE),true)
EXTRA_VERSION ?= snapshot-$(shell git rev-parse --short HEAD)
......
core/config/config_test.go
View file @ 85ef0832
/*
* Copyright IBM Corp All Rights Reserved
*
* SPDX-License-Identifier: Apache-2.0
*
*/
package config
import (
......
examples/e2e_cli/bootstrap.sh deleted 100755 → 0
View file @ d25b9945
#!/bin/bash
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
export ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')" | awk '{print tolower($0)}')
curl https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/fabric-binary/${ARCH}-1.0.0-alpha2/fabric-binary-${ARCH}-1.0.0-alpha2.tar.gz | tar xz
cd release/${ARCH}
sh download-dockerimages.sh -c $(uname -m)-1.0.0-alpha2 -f $(uname -m)-1.0.0-alpha2
examples/e2e_cli/download-dockerimages.sh
View file @ 85ef0832
......@@ -17,7 +17,7 @@ ARCH=`uname -m`
dockerFabricPull() {
local FABRIC_TAG=$1
for IMAGES in peer orderer couchdb ccenv javaenv kafka zookeeper; do
for IMAGES in peer orderer couchdb ccenv javaenv kafka tools zookeeper; do
echo "==> FABRIC IMAGE: $IMAGES"
echo
docker pull hyperledger/fabric-$IMAGES:$FABRIC_TAG
......@@ -46,9 +46,9 @@ usage() {
echo
echo
echo "EXAMPLE:"
echo "./download-dockerimages.sh -c x86_64-1.0.0-alpha -f x86_64-1.0.0-alpha"
echo "./download-dockerimages.sh -c x86_64-1.0.0-beta -f x86_64-1.0.0-beta"
echo
echo "By default, pulls fabric-ca and fabric 1.0.0-alpha docker images"
echo "By default, pulls fabric-ca and fabric 1.0.0-beta docker images"
echo "from hyperledger dockerhub"
exit 0
}
......@@ -68,8 +68,8 @@ while getopts "\?hc:f:" opt; do
esac
done
: ${CA_TAG:="$ARCH-1.0.0-alpha"}
: ${FABRIC_TAG:="$ARCH-1.0.0-alpha"}
: ${CA_TAG:="$ARCH-1.0.0-beta"}
: ${FABRIC_TAG:="$ARCH-1.0.0-beta"}
echo "===> Pulling fabric Images"
dockerFabricPull ${FABRIC_TAG}
......
examples/e2e_cli/end-to-end.rst
View file @ 85ef0832
......@@ -74,7 +74,7 @@ Build the binaries
cd $GOPATH/src/github.com/hyperledger/fabric
# ensure sure you are in the /fabric directory where the Makefile resides
make release-all
make release
This will output platform-specific binaries into the ``fabric/release`` folder.
......@@ -93,23 +93,23 @@ successfully, you should see an output similar to the following:
REPOSITORY TAG IMAGE ID CREATED SIZE
hyperledger/fabric-couchdb latest e2df4dd39ca9 38 minutes ago 1.51 GB
hyperledger/fabric-couchdb x86_64-1.0.0-alpha2 e2df4dd39ca9 38 minutes ago 1.51 GB
hyperledger/fabric-couchdb x86_64-1.0.0-beta e2df4dd39ca9 38 minutes ago 1.51 GB
hyperledger/fabric-kafka latest 08af4d797266 40 minutes ago 1.3 GB
hyperledger/fabric-kafka x86_64-1.0.0-alpha2 08af4d797266 40 minutes ago 1.3 GB
hyperledger/fabric-kafka x86_64-1.0.0-beta 08af4d797266 40 minutes ago 1.3 GB
hyperledger/fabric-zookeeper latest 444e9e695367 40 minutes ago 1.31 GB
hyperledger/fabric-zookeeper x86_64-1.0.0-alpha2 444e9e695367 40 minutes ago 1.31 GB
hyperledger/fabric-zookeeper x86_64-1.0.0-beta 444e9e695367 40 minutes ago 1.31 GB
hyperledger/fabric-testenv latest 8678d3101930 41 minutes ago 1.41 GB
hyperledger/fabric-testenv x86_64-1.0.0-alpha2 8678d3101930 41 minutes ago 1.41 GB
hyperledger/fabric-testenv x86_64-1.0.0-beta 8678d3101930 41 minutes ago 1.41 GB
hyperledger/fabric-buildenv latest 60911392c82e 41 minutes ago 1.33 GB
hyperledger/fabric-buildenv x86_64-1.0.0-alpha2 60911392c82e 41 minutes ago 1.33 GB
hyperledger/fabric-buildenv x86_64-1.0.0-beta 60911392c82e 41 minutes ago 1.33 GB
hyperledger/fabric-orderer latest 2afab937b9cc 41 minutes ago 182 MB
hyperledger/fabric-orderer x86_64-1.0.0-alpha2 2afab937b9cc 41 minutes ago 182 MB
hyperledger/fabric-orderer x86_64-1.0.0-beta 2afab937b9cc 41 minutes ago 182 MB
hyperledger/fabric-peer latest 9560e58e8089 41 minutes ago 185 MB
hyperledger/fabric-peer x86_64-1.0.0-alpha2 9560e58e8089 41 minutes ago 185 MB
hyperledger/fabric-peer x86_64-1.0.0-beta 9560e58e8089 41 minutes ago 185 MB
hyperledger/fabric-javaenv latest 881ca5219fad 42 minutes ago 1.43 GB
hyperledger/fabric-javaenv x86_64-1.0.0-alpha2 881ca5219fad 42 minutes ago 1.43 GB
hyperledger/fabric-javaenv x86_64-1.0.0-beta 881ca5219fad 42 minutes ago 1.43 GB
hyperledger/fabric-ccenv latest 28af77ffe9e9 43 minutes ago 1.29 GB
hyperledger/fabric-ccenv x86_64-1.0.0-alpha2 28af77ffe9e9 43 minutes ago 1.29 GB
hyperledger/fabric-ccenv x86_64-1.0.0-beta 28af77ffe9e9 43 minutes ago 1.29 GB
hyperledger/fabric-baseimage x86_64-0.3.0 f4751a503f02 3 months ago 1.27 GB
hyperledger/fabric-baseos x86_64-0.3.0 c3a4cf3b3350 3 months ago 161 MB
......@@ -877,7 +877,7 @@ again.
Error: rpc error: code = 14 desc = grpc: RPC failed fast due to transport failure
Make sure you pointed to the correct binaries in the release folder when
generating the artifacts, and that your backend is running against "alpha2" images
generating the artifacts, and that your backend is running against "beta" images
or compiled images from the current master branch.
If you see the below error:
......
scripts/bootstrap-1.0.0-beta.sh
View file @ 85ef0832
......@@ -12,7 +12,7 @@ MARCH=`uname -m`
dockerFabricPull() {
local FABRIC_TAG=$1
for IMAGES in peer orderer couchdb ccenv javaenv kafka zookeeper; do
for IMAGES in peer orderer couchdb ccenv javaenv kafka tools zookeeper; do
echo "==> FABRIC IMAGE: $IMAGES"
echo
docker pull hyperledger/fabric-$IMAGES:$FABRIC_TAG
......
scripts/changelog.sh
View file @ 85ef0832
......@@ -6,9 +6,9 @@
#
echo "## $2 $(date)" >> CHANGELOG.new
echo "## $2\n$(date)" >> CHANGELOG.new
echo "" >> CHANGELOG.new
git log $1..$2 --oneline | grep -v Merge | sed -e "s/\[\(FAB-[0-9]*\)\]/\[\1\](https:\/\/jira.hyperledger.org\/browse\/\1\)/" -e "s/ \(FAB-[0-9]*\)/ \[\1\](https:\/\/jira.hyperledger.org\/browse\/\1\)/" -e "s/\([0-9|a-z]*\)/* \[\1\](https:\/\/github.com\/hyperledger\/fabric\/commit\/\1)/" >> CHANGELOG.new
git log $1..HEAD --oneline | grep -v Merge | sed -e "s/\[\(FAB-[0-9]*\)\]/\[\1\](https:\/\/jira.hyperledger.org\/browse\/\1\)/" -e "s/ \(FAB-[0-9]*\)/ \[\1\](https:\/\/jira.hyperledger.org\/browse\/\1\)/" -e "s/\([0-9|a-z]*\)/* \[\1\](https:\/\/github.com\/hyperledger\/fabric\/commit\/\1)/" >> CHANGELOG.new
echo "" >> CHANGELOG.new
cat CHANGELOG.md >> CHANGELOG.new
mv -f CHANGELOG.new CHANGELOG.md
scripts/check_spelling.sh
View file @ 85ef0832
......@@ -5,12 +5,12 @@
# SPDX-License-Identifier: Apache-2.0
#
CHECK=$(git diff --name-only HEAD * | grep -v .png$ | grep -v .git \
CHECK=$(git diff --name-only HEAD * | grep -v .png$ | grep -v .git | grep -v ^CHANGELOG \
| grep -v ^vendor/ | grep -v ^build/ | sort -u)
if [[ -z "$CHECK" ]]; then
CHECK=$(git diff-tree --no-commit-id --name-only -r $(git log -2 \
--pretty=format:"%h") | grep -v .png$ | grep -v .git \
--pretty=format:"%h") | grep -v .png$ | grep -v .git | grep -v ^CHANGELOG \
| grep -v ^vendor/ | grep -v ^build/ | sort -u)
fi
......@@ -22,4 +22,4 @@ if [ -z "$errs" ]; then
fi
echo "The following files are have spelling errors:"
echo "$errs"
exit 1
exit 0
test/chaincodes/BadImport/main.go
View file @ 85ef0832
/*
* Copyright Greg Haskins All Rights Reserved
*
* SPDX-License-Identifier: Apache-2.0
*
*/
package main
import (
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment