Skip to content

Commit

Permalink
gen .make/go-pkgdeps.mk
Browse files Browse the repository at this point in the history
  • Loading branch information
pacoxu committed Nov 15, 2024
1 parent 556548b commit f9a35a0
Show file tree
Hide file tree
Showing 4 changed files with 1,112 additions and 5 deletions.
3 changes: 1 addition & 2 deletions hack/test_cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -o nounset
set -o pipefail

source "kit/helper.sh"
export KUBE_ROOT=$(dirname "$(readlink -f "$0")")/../src/github.com/kubernetes/kubernetes/
export KUBE_ROOT=$(dirname "$(readlink -f "$0")")/..
export TERM=linux
echo "KUBE_ROOT directory: $KUBE_ROOT"
cd "${WORKDIR}"
Expand All @@ -21,7 +21,6 @@ make generated_files kubeadm
./build/run.sh make all WHAT=cmd/kubeadm
mkdir -p _output/local/go/bin/ && cp _output/dockerized/bin/linux/amd64/kubeadm _output/local/go/bin/
./hack/install-etcd.sh
TERM=linux PATH=$(pwd)/third_party/etcd:${PATH} make test-cmd
' 2>&1 | grep -v -E '^I\w+ ' && exit 0
done
14 changes: 12 additions & 2 deletions hack/test_integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,30 @@ set -o nounset
set -o pipefail

source "kit/helper.sh"
export KUBE_ROOT=$(dirname "$(readlink -f "$0")")/..
export TERM=linux
echo "KUBE_ROOT directory: $KUBE_ROOT"
cd "${WORKDIR}"
echo "WORKDIR directory: $WORKDIR"

TMPFILE="${TMPDIR}/test-integration.log"

# Etcd was added for testing in 1.21 and later
function test-integration() {
./build/shell.sh -c '
./hack/install-etcd.sh
PATH=$(pwd)/third_party/etcd:${PATH} make test-integration
# generate .make/go-pkgdeps.mk
make generated_files
# run test-integration
KUBE_RUN_COPY_OUTPUT=y TERM=linux PATH=$(pwd)/third_party/etcd:${PATH} DBG_CODEGEN=1 make test-integration
'
}

test-integration 2>&1 | tee "${TMPFILE}" | grep -v -E '^I\w+ ' && exit 0

echo "-------print TMPFILE:"
cat "${TMPFILE}"
echo "-------TMPFILE end."

RETRY_CASES=$(cat "${TMPFILE}" | grep -E '^FAIL\s+k8s.io/kubernetes' | awk '{print $2}' || echo "")

TAG=$(helper::workdir::version)
Expand Down
Loading

0 comments on commit f9a35a0

Please sign in to comment.