diff --git a/scripts/genproto.sh b/scripts/genproto.sh index 764c5849e..f28949a80 100755 --- a/scripts/genproto.sh +++ b/scripts/genproto.sh @@ -34,7 +34,7 @@ echo " - grpc-gateway-root: ${GRPC_GATEWAY_ROOT}" GOGOPROTO_PATH="${GOGOPROTO_ROOT}:${GOGOPROTO_ROOT}/protobuf" # directories containing protos to be built -DIRS="./server/storage/wal/walpb ./api/etcdserverpb ./server/etcdserver/api/snap/snappb ./raft/raftpb ./api/mvccpb ./server/lease/leasepb ./api/authpb ./server/etcdserver/api/v3lock/v3lockpb ./server/etcdserver/api/v3election/v3electionpb ./api/membershippb ./tests/functional ./api/versionpb" +DIRS="./server/storage/wal/walpb ./api/etcdserverpb ./server/etcdserver/api/snap/snappb ./api/mvccpb ./server/lease/leasepb ./api/authpb ./server/etcdserver/api/v3lock/v3lockpb ./server/etcdserver/api/v3election/v3electionpb ./api/membershippb ./tests/functional ./api/versionpb" log_callout -e "\\nRunning gofast (gogo) proto generation..." @@ -44,7 +44,6 @@ for dir in ${DIRS}; do --plugin="${GOFAST_BIN}" ./**/*.proto run sed -i.bak -E 's|"etcd/api/|"go.etcd.io/etcd/api/v3/|g' ./**/*.pb.go - run sed -i.bak -E 's|"raft/raftpb"|"go.etcd.io/etcd/raft/v3/raftpb"|g' ./**/*.pb.go run sed -i.bak -E 's|"google/protobuf"|"github.com/gogo/protobuf/protoc-gen-gogo/descriptor"|g' ./**/*.pb.go rm -f ./**/*.bak diff --git a/scripts/test.sh b/scripts/test.sh index 030c6d801..f1d4df207 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -105,7 +105,6 @@ function unit_pass { function integration_extra { if [ -z "${PKG}" ] ; then - run_for_module "." go_test "./contrib/raftexample" "keep_going" : -timeout="${TIMEOUT:-5m}" "${RUN_ARG[@]}" "${COMMON_TEST_FLAGS[@]}" "$@" || return $? run_for_module "tests" go_test "./integration/v2store/..." "keep_going" : -timeout="${TIMEOUT:-5m}" "${RUN_ARG[@]}" "${COMMON_TEST_FLAGS[@]}" "$@" || return $? else log_warning "integration_extra ignored when PKG is specified" @@ -371,7 +370,6 @@ function cov_pass { sed --in-place -E "s|go.etcd.io/etcd/etcdctl/v3/|etcdctl/|g" "${cover_out_file}" || true sed --in-place -E "s|go.etcd.io/etcd/etcdutl/v3/|etcdutl/|g" "${cover_out_file}" || true sed --in-place -E "s|go.etcd.io/etcd/pkg/v3/|pkg/|g" "${cover_out_file}" || true - sed --in-place -E "s|go.etcd.io/etcd/raft/v3/|raft/|g" "${cover_out_file}" || true sed --in-place -E "s|go.etcd.io/etcd/server/v3/|server/|g" "${cover_out_file}" || true # held failures to generate the full coverage file, now fail diff --git a/scripts/test_lib.sh b/scripts/test_lib.sh index 8bcc6f7f4..475d91dce 100644 --- a/scripts/test_lib.sh +++ b/scripts/test_lib.sh @@ -164,7 +164,7 @@ function run_for_module { } function module_dirs() { - echo "api pkg raft client/pkg client/v2 client/v3 server etcdutl etcdctl tests ." + echo "api pkg client/pkg client/v2 client/v3 server etcdutl etcdctl tests ." } # maybe_run [cmd...] runs given command depending on the DRY_RUN flag. @@ -180,7 +180,6 @@ function modules() { modules=( "${ROOT_MODULE}/api/v3" "${ROOT_MODULE}/pkg/v3" - "${ROOT_MODULE}/raft/v3" "${ROOT_MODULE}/client/pkg/v3" "${ROOT_MODULE}/client/v2" "${ROOT_MODULE}/client/v3"