Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

package rename wasnt approved yet, backing out cruft that snuck into last pr

Browse Source 
Signed-off-by: Luther Monson <luther.monson@gmail.com>
This commit is contained in:
Luther Monson 2021-12-21 15:57:38 -07:00
parent 02f862da5f
commit 3ee3ecb3ac
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build
View File

@ -7,7 +7,7 @@ cd $(dirname $0)/..
GO=${GO-go} GO=${GO-go}
PKG="github.com/k3s-io/k3s" PKG="github.com/rancher/k3s"
PKG_CONTAINERD="github.com/containerd/containerd" PKG_CONTAINERD="github.com/containerd/containerd"
PKG_K3S_CONTAINERD="github.com/k3s-io/containerd" PKG_K3S_CONTAINERD="github.com/k3s-io/containerd"
PKG_CRICTL="github.com/kubernetes-sigs/cri-tools/pkg" PKG_CRICTL="github.com/kubernetes-sigs/cri-tools/pkg"

4
scripts/build-tests-sonobuoy
View File

@ -14,7 +14,7 @@ PKG_TO_TEST=$(find ./pkg/ -type f -name "*_int_test.go" | sed -r 's|/[^/]+$||' |
for i in $PKG_TO_TEST; do for i in $PKG_TO_TEST; do
name=$(echo "${i##*/}") name=$(echo "${i##*/}")
echo $name echo $name
go test -c -v -ldflags "-X 'github.com/k3s-io/k3s/tests/util.existingServer=True'" -o dist/artifacts/k3s-integration-$name.test $i -run Integration go test -c -v -ldflags "-X 'github.com/rancher/k3s/tests/util.existingServer=True'" -o dist/artifacts/k3s-integration-$name.test $i -run Integration
done done
# Integration tests under /tests # Integration tests under /tests
@ -22,7 +22,7 @@ PKG_TO_TEST=$(find ./tests/integration -type f -name "*_int_test.go" | sed -r 's
for i in $PKG_TO_TEST; do for i in $PKG_TO_TEST; do
name=$(echo "${i##*/}") name=$(echo "${i##*/}")
echo $name echo $name
go test -c -v -ldflags "-X 'github.com/k3s-io/k3s/tests/util.existingServer=True'" -o dist/artifacts/k3s-integration-$name.test $i -run Integration go test -c -v -ldflags "-X 'github.com/rancher/k3s/tests/util.existingServer=True'" -o dist/artifacts/k3s-integration-$name.test $i -run Integration
done done
docker build -f ./tests/integration/Dockerfile.test -t $REPO . docker build -f ./tests/integration/Dockerfile.test -t $REPO .
docker save $REPO -o ./dist/artifacts/$REPO.tar docker save $REPO -o ./dist/artifacts/$REPO.tar

4
scripts/package-cli
View File

@ -52,8 +52,8 @@ CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX}
"${GO}" generate "${GO}" generate
LDFLAGS=" LDFLAGS="
-X github.com/k3s-io/k3s/pkg/version.Version=$VERSION -X github.com/rancher/k3s/pkg/version.Version=$VERSION
-X github.com/k3s-io/k3s/pkg/version.GitCommit=${COMMIT:0:8} -X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8}
-w -s -w -s
" "
STATIC="-extldflags '-static'" STATIC="-extldflags '-static'"