Merge pull request #5 from openshift-cherrypick-robot/cherry-pick-4-to-release-3.11

[release-3.11] Bump release tools

Author: openshift-merge-robot

hack/build-images.sh

@@ -20,6 +20,13 @@ os::util::ensure::gopath_binary_exists imagebuilder
 os::build::release::check_for_rpms
 
 # we need to mount RPMs into the container builds for installation
-OS_BUILD_IMAGE_ARGS="${OS_BUILD_IMAGE_ARGS:-} -mount ${OS_OUTPUT_RPMPATH}/:/srv/origin-local-release/"
+cat <<END > "${OS_OUTPUT_RPMPATH}/_local.repo"
+[origin-local-release]
+name = OpenShift Origin Release from Local Source
+baseurl = file:///srv/origin-local-release/
+gpgcheck = 0
+enabled = 0
+END
+OS_BUILD_IMAGE_ARGS="${OS_BUILD_IMAGE_ARGS:-} -mount ${OS_OUTPUT_RPMPATH}/:/srv/origin-local-release/ -mount ${OS_OUTPUT_RPMPATH}/_local.repo:/etc/yum.repos.d/origin-local-release.repo"
 
 os::build::images

hack/deps

@@ -26,4 +26,4 @@ if [[ $# -eq 0 ]]; then
 fi
 
 os::util::ensure::system_binary_exists 'digraph'
-cat "${OS_OUTPUT}/deps" | digraph $@
+digraph "${@}" <"${OS_OUTPUT}/deps"

hack/lib/build/binaries.sh

@@ -85,7 +85,9 @@ function os::build::setup_env() {
   if [[ "${TRAVIS:-}" != "true" ]]; then
     local go_version
     go_version=($(go version))
-    if [[ "${go_version[2]}" < "${OS_REQUIRED_GO_VERSION}" ]]; then
+    local expected_order=$(printf "%s\n%s\n" "${OS_REQUIRED_GO_VERSION}" "${go_version[2]}")
+    local actual_order=$(echo "${expected_order}" | sort --version-sort)
+    if [[ "${actual_order}" != "${expected_order}" ]]; then
       os::log::fatal "Detected Go version: ${go_version[*]}.
 Builds require Go version ${OS_REQUIRED_GO_VERSION} or greater."
     fi

hack/lib/cmd.sh

@@ -383,8 +383,8 @@ readonly -f os::cmd::internal::get_results
 
 # os::cmd::internal::get_last_results prints the stderr and stdout from the last attempt
 function os::cmd::internal::get_last_results() {
-	cat "${os_cmd_internal_tmpout}" | awk 'BEGIN { RS = "\x1e" } END { print $0 }'
-	cat "${os_cmd_internal_tmperr}" | awk 'BEGIN { RS = "\x1e" } END { print $0 }'
+	awk 'BEGIN { RS = "\x1e" } END { print $0 }' <"${os_cmd_internal_tmpout}"
+	awk 'BEGIN { RS = "\x1e" } END { print $0 }' <"${os_cmd_internal_tmperr}"
 }
 readonly -f os::cmd::internal::get_last_results
 

hack/lib/test/junit.sh

@@ -143,62 +143,3 @@ function os::test::junit::reconcile_output() {
     done
 }
 readonly -f os::test::junit::reconcile_output
-
-# os::test::junit::generate_report determines which type of report is to
-# be generated and does so from the raw output of the tests.
-#
-# Globals:
-#  - JUNIT_REPORT_OUTPUT
-#  - ARTIFACT_DIR
-# Arguments:
-#  None
-# Returns:
-#  None
-function os::test::junit::generate_report() {
-    if [[ -z "${JUNIT_REPORT_OUTPUT:-}" ||
-          -n "${JUNIT_REPORT_OUTPUT:-}" && ! -s "${JUNIT_REPORT_OUTPUT:-}" ]]; then
-        # we can't generate a report
-        return
-    fi
-
-    if grep -q "=== END TEST CASE ===" "${JUNIT_REPORT_OUTPUT}"; then
-        os::test::junit::reconcile_output
-        os::test::junit::check_test_counters
-        os::test::junit::internal::generate_report "oscmd"
-    else
-        os::test::junit::internal::generate_report "gotest"
-    fi
-}
-
-# os::test::junit::internal::generate_report generats an XML jUnit
-# report for either `os::cmd` or `go test`, based on the passed
-# argument. If the `junitreport` binary is not present, it will be built.
-#
-# Globals:
-#  - JUNIT_REPORT_OUTPUT
-#  - ARTIFACT_DIR
-# Arguments:
-#  - 1: specify which type of tests command output should junitreport read
-# Returns:
-#  export JUNIT_REPORT_NUM_FAILED
-function os::test::junit::internal::generate_report() {
-    local report_type="$1"
-    os::util::ensure::built_binary_exists 'junitreport'
-
-    local report_file
-    report_file="$( mktemp "${ARTIFACT_DIR}/${report_type}_report_XXXXX" ).xml"
-    os::log::info "jUnit XML report placed at $( os::util::repository_relative_path ${report_file} )"
-    junitreport --type "${report_type}"             \
-                --suites nested                     \
-                --roots github.com/openshift/origin \
-                --output "${report_file}"           \
-                <"${JUNIT_REPORT_OUTPUT}"
-
-    local summary
-    summary=$( junitreport summarize <"${report_file}" )
-
-    JUNIT_REPORT_NUM_FAILED="$( grep -oE "[0-9]+ failed" <<<"${summary}" )"
-    export JUNIT_REPORT_NUM_FAILED
-
-    echo "${summary}"
-}

hack/lib/util/golang.sh

@@ -1,22 +1,3 @@
 #!/bin/bash
 #
 # This library holds golang related utility functions.
-
-# os::golang::verify_go_version ensure the go tool exists and is a viable version.
-function os::golang::verify_go_version() {
-	os::util::ensure::system_binary_exists 'go'
-
-	local go_version
-	go_version=($(go version))
-	if [[ "${go_version[2]}" != go1.8* ]]; then
-		os::log::info "Detected go version: ${go_version[*]}."
-		if [[ -z "${PERMISSIVE_GO:-}" ]]; then
-			os::log::fatal "Please install Go version ${OS_REQUIRED_GO_VERSION} or use PERMISSIVE_GO=y to bypass this check."
-		else
-			os::log::warning "Detected golang version doesn't match required Go version."
-			os::log::warning "This version mismatch could lead to differences in execution between this run and the CI systems."
-			return 0
-		fi
-	fi
-}
-readonly -f os::golang::verify_go_version

hack/test-go.sh

@@ -21,14 +21,6 @@
 function cleanup() {
     return_code=$?
 
-    os::test::junit::generate_report
-    if [[ "${JUNIT_REPORT_NUM_FAILED:-}" == "0 failed" ]]; then
-        if [[ "${return_code}" -ne "0" ]]; then
-            os::log::warning "While the jUnit report found no failed tests, the \`go test\` process failed."
-            os::log::warning "This usually means that the unit test suite failed to compile."
-        fi
-    fi
-
     os::util::describe_return_code "${return_code}"
     exit "${return_code}"
 }
@@ -135,11 +127,15 @@ if [[ -n "${junit_report}" ]]; then
     # we don't care if the `go test` fails in this pipe, as we want to generate the report and summarize the output anyway
     set +o pipefail
 
-    go test -i ${gotest_flags} ${test_packages}
-    go test ${gotest_flags} ${test_packages} 2>"${test_error_file}" | tee "${JUNIT_REPORT_OUTPUT}"
+    os::util::ensure::built_binary_exists 'gotest2junit'
+    report_file="$( mktemp "${ARTIFACT_DIR}/unit_report_XXXXX" ).xml"
 
+    go test -json ${gotest_flags} ${test_packages} 2>"${test_error_file}" | tee "${JUNIT_REPORT_OUTPUT}" | gotest2junit > "${report_file}"
     test_return_code="${PIPESTATUS[0]}"
 
+    gzip "${test_error_file}" -c > "${ARTIFACT_DIR}/unit-error.log.gz"
+    gzip "${JUNIT_REPORT_OUTPUT}" -c > "${ARTIFACT_DIR}/unit.log.gz"
+
     set -o pipefail
 
     if [[ -s "${test_error_file}" ]]; then
@@ -162,7 +158,6 @@ $( cat "${test_error_file}") "
 
 elif [[ -n "${coverage_output_dir}" ]]; then
     # we need to generate coverage reports
-    go test -i ${gotest_flags} ${test_packages}
     for test_package in ${test_packages}; do
         mkdir -p "${coverage_output_dir}/${test_package}"
         local_gotest_flags="${gotest_flags} -coverprofile=${coverage_output_dir}/${test_package}/profile.out"
@@ -187,6 +182,5 @@ elif [[ -n "${dlv_debug}" ]]; then
     dlv test ${test_packages}
 else
     # we need to generate neither jUnit XML nor coverage reports
-    go test -i ${gotest_flags} ${test_packages}
     go test ${gotest_flags} ${test_packages}
 fi

hack/verify-gofmt.sh

@@ -8,8 +8,6 @@ function cleanup() {
 }
 trap "cleanup" EXIT
 
-os::golang::verify_go_version
-
 bad_files=$(os::util::list_go_src_files | xargs gofmt -s -l)
 if [[ -n "${bad_files}" ]]; then
 	os::log::warning "!!! gofmt needs to be run on the listed files"

hack/verify-golint.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
 
-os::golang::verify_go_version
 os::util::ensure::system_binary_exists 'golint'
 
 arg="${1:-""}"

hack/verify-govet.sh

@@ -8,8 +8,6 @@ function cleanup() {
 }
 trap "cleanup" EXIT
 
-os::golang::verify_go_version
-
 govet_blacklist=( "${OS_GOVET_BLACKLIST[@]-}" )
 
 function govet_blacklist_contains() {