Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
3ee3ecb3
Commit
3ee3ecb3
authored
Dec 21, 2021
by
Luther Monson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
package rename wasnt approved yet, backing out cruft that snuck into last pr
Signed-off-by:
Luther Monson
<
luther.monson@gmail.com
>
parent
02f862da
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
build
scripts/build
+1
-1
build-tests-sonobuoy
scripts/build-tests-sonobuoy
+2
-2
package-cli
scripts/package-cli
+2
-2
No files found.
scripts/build
View file @
3ee3ecb3
...
@@ -7,7 +7,7 @@ cd $(dirname $0)/..
...
@@ -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"
...
...
scripts/build-tests-sonobuoy
View file @
3ee3ecb3
...
@@ -14,7 +14,7 @@ PKG_TO_TEST=$(find ./pkg/ -type f -name "*_int_test.go" | sed -r 's|/[^/]+$||' |
...
@@ -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
...
@@ -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
...
...
scripts/package-cli
View file @
3ee3ecb3
...
@@ -52,8 +52,8 @@ CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX}
...
@@ -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'"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment