chore: drop integration binary from releases

Drop integration binary from releases. Signed-off-by: Noel Georgi <[email protected]>
siderolabs · Mar 8, 2024 · 0960100 · 0960100
1 parent 6e3ba5c
commit 0960100
Show file tree

Hide file tree

Showing 32 changed files with 46 additions and 46 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-03-07T20:47:59Z by kres latest.
+# Generated on 2024-03-07T17:30:39Z by kres latest.
 
 name: default
 concurrency:
@@ -76,6 +76,9 @@ jobs:
       - name: unit-tests-race
         run: |
           make unit-tests-race
+      - name: integration-test
+        run: |
+          make integration-test
       - name: omni
         run: |
           make omni
@@ -106,9 +109,6 @@ jobs:
           PUSH: "true"
         run: |
           make image-omni TAG=latest
-      - name: omni-integration-test
-        run: |
-          make omni-integration-test
       - name: omnictl
         run: |
           make omnictl

diff --git a/.kres.yaml b/.kres.yaml
@@ -5,7 +5,7 @@ spec:
   disableImage: true
 ---
 kind: auto.CommandConfig
-name: omni-integration-test
+name: integration-test
 spec:
   disableImage: true
 ---
@@ -144,7 +144,7 @@ spec:
   makefile:
     enabled: true
     depends:
-      - omni-integration-test-linux-amd64
+      - integration-test-linux-amd64
       - omnictl-linux-amd64
       - omni-linux-amd64
     script:
@@ -272,7 +272,7 @@ spec:
       GOARCH: amd64
 ---
 kind: golang.Build
-name: omni-integration-test
+name: integration-test
 spec:
   outputs:
     linux-amd64:

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -151,8 +151,8 @@ PASS
 Another way to run integration tests directly:
 
 ```shell
-$ make _out/omni-integration-test-linux-amd64
-$ sudo -E _out/omni-integration-test-linux-amd64 \
+$ make _out/integration-test-linux-amd64
+$ sudo -E _out/integration-test-linux-amd64 \
     --endpoint=https://my.host \
     --expected-machines=6
 ```

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-03-07T20:47:59Z by kres latest.
+# Generated on 2024-03-08T09:31:20Z by kres latest.
 
 ARG JS_TOOLCHAIN
 ARG TOOLCHAIN
@@ -329,20 +329,20 @@ COPY --from=unit-tests-client-run /src/client/coverage.txt /coverage-unit-tests-
 FROM scratch AS unit-tests
 COPY --from=unit-tests-run /src/coverage.txt /coverage-unit-tests.txt
 
-# builds omni-darwin-amd64
-FROM base AS omni-darwin-amd64-build
+# builds integration-test-linux-amd64
+FROM base AS integration-test-linux-amd64-build
 COPY --from=generate / /
 COPY --from=embed-generate / /
-WORKDIR /src/cmd/omni
+WORKDIR /src/cmd/integration-test
 ARG GO_BUILDFLAGS
 ARG GO_LDFLAGS
 ARG VERSION_PKG="internal/version"
 ARG SHA
 ARG TAG
-RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg GOARCH=amd64 GOOS=darwin go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${VERSION_PKG}.Name=omni -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /omni-darwin-amd64
+RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg GOARCH=amd64 GOOS=linux go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${VERSION_PKG}.Name=integration-test -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /integration-test-linux-amd64
 
-# builds omni-darwin-arm64
-FROM base AS omni-darwin-arm64-build
+# builds omni-darwin-amd64
+FROM base AS omni-darwin-amd64-build
 COPY --from=generate / /
 COPY --from=embed-generate / /
 WORKDIR /src/cmd/omni
@@ -351,19 +351,19 @@ ARG GO_LDFLAGS
 ARG VERSION_PKG="internal/version"
 ARG SHA
 ARG TAG
-RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg GOARCH=arm64 GOOS=darwin go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${VERSION_PKG}.Name=omni -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /omni-darwin-arm64
+RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg GOARCH=amd64 GOOS=darwin go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${VERSION_PKG}.Name=omni -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /omni-darwin-amd64
 
-# builds omni-integration-test-linux-amd64
-FROM base AS omni-integration-test-linux-amd64-build
+# builds omni-darwin-arm64
+FROM base AS omni-darwin-arm64-build
 COPY --from=generate / /
 COPY --from=embed-generate / /
-WORKDIR /src/cmd/omni-integration-test
+WORKDIR /src/cmd/omni
 ARG GO_BUILDFLAGS
 ARG GO_LDFLAGS
 ARG VERSION_PKG="internal/version"
 ARG SHA
 ARG TAG
-RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg GOARCH=amd64 GOOS=linux go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${VERSION_PKG}.Name=omni-integration-test -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /omni-integration-test-linux-amd64
+RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg GOARCH=arm64 GOOS=darwin go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${VERSION_PKG}.Name=omni -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /omni-darwin-arm64
 
 # builds omni-linux-amd64
 FROM base AS omni-linux-amd64-build
@@ -449,15 +449,15 @@ ARG SHA
 ARG TAG
 RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg GOARCH=amd64 GOOS=windows go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${VERSION_PKG}.Name=omnictl -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /omnictl-windows-amd64.exe
 
+FROM scratch AS integration-test-linux-amd64
+COPY --from=integration-test-linux-amd64-build /integration-test-linux-amd64 /integration-test-linux-amd64
+
 FROM scratch AS omni-darwin-amd64
 COPY --from=omni-darwin-amd64-build /omni-darwin-amd64 /omni-darwin-amd64
 
 FROM scratch AS omni-darwin-arm64
 COPY --from=omni-darwin-arm64-build /omni-darwin-arm64 /omni-darwin-arm64
 
-FROM scratch AS omni-integration-test-linux-amd64
-COPY --from=omni-integration-test-linux-amd64-build /omni-integration-test-linux-amd64 /omni-integration-test-linux-amd64
-
 FROM scratch AS omni-linux-amd64
 COPY --from=omni-linux-amd64-build /omni-linux-amd64 /omni-linux-amd64
 
@@ -479,10 +479,10 @@ COPY --from=omnictl-linux-arm64-build /omnictl-linux-arm64 /omnictl-linux-arm64
 FROM scratch AS omnictl-windows-amd64.exe
 COPY --from=omnictl-windows-amd64.exe-build /omnictl-windows-amd64.exe /omnictl-windows-amd64.exe
 
-FROM omni-integration-test-linux-${TARGETARCH} AS omni-integration-test
+FROM integration-test-linux-${TARGETARCH} AS integration-test
 
-FROM scratch AS omni-integration-test-all
-COPY --from=omni-integration-test-linux-amd64 / /
+FROM scratch AS integration-test-all
+COPY --from=integration-test-linux-amd64 / /
 
 FROM omni-linux-${TARGETARCH} AS omni
 

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-03-08T08:13:22Z by kres latest.
+# Generated on 2024-03-08T09:31:20Z by kres latest.
 
 # common variables
 
@@ -138,7 +138,7 @@ else
 GO_LDFLAGS += -s
 endif
 
-all: unit-tests-frontend lint-eslint frontend unit-tests-client unit-tests omni image-omni omni-integration-test omnictl dev-server docker-compose-up docker-compose-down mkcert-install mkcert-generate mkcert-uninstall run-integration-test lint
+all: unit-tests-frontend lint-eslint frontend unit-tests-client unit-tests integration-test omni image-omni omnictl dev-server docker-compose-up docker-compose-down mkcert-install mkcert-generate mkcert-uninstall run-integration-test lint
 
 .PHONY: clean
 clean:  ## Cleans up all artifacts.
@@ -226,6 +226,16 @@ unit-tests:  ## Performs unit tests
 unit-tests-race:  ## Performs unit tests with race detection enabled.
 	@$(MAKE) target-$@
 
+.PHONY: $(ARTIFACTS)/integration-test-linux-amd64
+$(ARTIFACTS)/integration-test-linux-amd64:
+	@$(MAKE) local-integration-test-linux-amd64 DEST=$(ARTIFACTS)
+
+.PHONY: integration-test-linux-amd64
+integration-test-linux-amd64: $(ARTIFACTS)/integration-test-linux-amd64  ## Builds executable for integration-test-linux-amd64.
+
+.PHONY: integration-test
+integration-test: integration-test-linux-amd64  ## Builds executables for integration-test.
+
 .PHONY: $(ARTIFACTS)/omni-darwin-amd64
 $(ARTIFACTS)/omni-darwin-amd64:
 	@$(MAKE) local-omni-darwin-amd64 DEST=$(ARTIFACTS)
@@ -268,16 +278,6 @@ lint: lint-golangci-lint-client lint-gofumpt-client lint-govulncheck-client lint
 image-omni:  ## Builds image for omni.
 	@$(MAKE) target-$@ TARGET_ARGS="--tag=$(REGISTRY)/$(USERNAME)/omni:$(TAG)"
 
-.PHONY: $(ARTIFACTS)/omni-integration-test-linux-amd64
-$(ARTIFACTS)/omni-integration-test-linux-amd64:
-	@$(MAKE) local-omni-integration-test-linux-amd64 DEST=$(ARTIFACTS)
-
-.PHONY: omni-integration-test-linux-amd64
-omni-integration-test-linux-amd64: $(ARTIFACTS)/omni-integration-test-linux-amd64  ## Builds executable for omni-integration-test-linux-amd64.
-
-.PHONY: omni-integration-test
-omni-integration-test: omni-integration-test-linux-amd64  ## Builds executables for omni-integration-test.
-
 .PHONY: $(ARTIFACTS)/omnictl-darwin-amd64
 $(ARTIFACTS)/omnictl-darwin-amd64:
 	@$(MAKE) local-omnictl-darwin-amd64 DEST=$(ARTIFACTS)
@@ -340,7 +340,7 @@ mkcert-generate:
 mkcert-uninstall:
 	go run ./hack/generate-certs uninstall
 
-run-integration-test: omni-integration-test-linux-amd64 omnictl-linux-amd64 omni-linux-amd64
+run-integration-test: integration-test-linux-amd64 omnictl-linux-amd64 omni-linux-amd64
 	@hack/test/integration.sh
 
 .PHONY: rekres

diff --git a/cmd/omni-integration-test/main.go → cmd/integration-test/main.go b/cmd/omni-integration-test/main.go → cmd/integration-test/main.go
diff --git a/...ion-test/pkg/clientconfig/clientconfig.go → ...ion-test/pkg/clientconfig/clientconfig.go b/...ion-test/pkg/clientconfig/clientconfig.go → ...ion-test/pkg/clientconfig/clientconfig.go
diff --git a/...st/pkg/clientconfig/register_key_debug.go → ...st/pkg/clientconfig/register_key_debug.go b/...st/pkg/clientconfig/register_key_debug.go → ...st/pkg/clientconfig/register_key_debug.go
diff --git a/...pkg/clientconfig/register_key_no_debug.go → ...pkg/clientconfig/register_key_no_debug.go b/...pkg/clientconfig/register_key_no_debug.go → ...pkg/clientconfig/register_key_no_debug.go
diff --git a/cmd/omni-integration-test/pkg/tests/auth.go → cmd/integration-test/pkg/tests/auth.go b/cmd/omni-integration-test/pkg/tests/auth.go → cmd/integration-test/pkg/tests/auth.go
@@ -55,7 +55,7 @@ import (
 	"github.com/siderolabs/omni/client/pkg/omni/resources/siderolink"
 	"github.com/siderolabs/omni/client/pkg/omni/resources/system"
 	"github.com/siderolabs/omni/client/pkg/omni/resources/virtual"
-	"github.com/siderolabs/omni/cmd/omni-integration-test/pkg/clientconfig"
+	"github.com/siderolabs/omni/cmd/integration-test/pkg/clientconfig"
 	"github.com/siderolabs/omni/internal/backend/runtime/omni/validated"
 	"github.com/siderolabs/omni/internal/pkg/auth"
 	"github.com/siderolabs/omni/internal/pkg/auth/role"

diff --git a/...omni-integration-test/pkg/tests/backup.go → cmd/integration-test/pkg/tests/backup.go b/...omni-integration-test/pkg/tests/backup.go → cmd/integration-test/pkg/tests/backup.go
diff --git a/...omni-integration-test/pkg/tests/blocks.go → cmd/integration-test/pkg/tests/blocks.go b/...omni-integration-test/pkg/tests/blocks.go → cmd/integration-test/pkg/tests/blocks.go
diff --git a/...mni-integration-test/pkg/tests/cleanup.go → cmd/integration-test/pkg/tests/cleanup.go b/...mni-integration-test/pkg/tests/cleanup.go → cmd/integration-test/pkg/tests/cleanup.go
diff --git a/...mni-integration-test/pkg/tests/cluster.go → cmd/integration-test/pkg/tests/cluster.go b/...mni-integration-test/pkg/tests/cluster.go → cmd/integration-test/pkg/tests/cluster.go
diff --git a/...omni-integration-test/pkg/tests/common.go → cmd/integration-test/pkg/tests/common.go b/...omni-integration-test/pkg/tests/common.go → cmd/integration-test/pkg/tests/common.go
diff --git a/...ntegration-test/pkg/tests/config_patch.go → ...ntegration-test/pkg/tests/config_patch.go b/...ntegration-test/pkg/tests/config_patch.go → ...ntegration-test/pkg/tests/config_patch.go
diff --git a/...-integration-test/pkg/tests/extensions.go → cmd/integration-test/pkg/tests/extensions.go b/...-integration-test/pkg/tests/extensions.go → cmd/integration-test/pkg/tests/extensions.go
diff --git a/cmd/omni-integration-test/pkg/tests/image.go → cmd/integration-test/pkg/tests/image.go b/cmd/omni-integration-test/pkg/tests/image.go → cmd/integration-test/pkg/tests/image.go
diff --git a/...-integration-test/pkg/tests/kubernetes.go → cmd/integration-test/pkg/tests/kubernetes.go b/...-integration-test/pkg/tests/kubernetes.go → cmd/integration-test/pkg/tests/kubernetes.go
diff --git a/...ni-integration-test/pkg/tests/machines.go → cmd/integration-test/pkg/tests/machines.go b/...ni-integration-test/pkg/tests/machines.go → cmd/integration-test/pkg/tests/machines.go
diff --git a/...-integration-test/pkg/tests/omniconfig.go → cmd/integration-test/pkg/tests/omniconfig.go b/...-integration-test/pkg/tests/omniconfig.go → cmd/integration-test/pkg/tests/omniconfig.go
diff --git a/...egration-test/pkg/tests/rolling_update.go → ...egration-test/pkg/tests/rolling_update.go b/...egration-test/pkg/tests/rolling_update.go → ...egration-test/pkg/tests/rolling_update.go
diff --git a/...-integration-test/pkg/tests/siderolink.go → cmd/integration-test/pkg/tests/siderolink.go b/...-integration-test/pkg/tests/siderolink.go → cmd/integration-test/pkg/tests/siderolink.go
diff --git a/cmd/omni-integration-test/pkg/tests/talos.go → cmd/integration-test/pkg/tests/talos.go b/cmd/omni-integration-test/pkg/tests/talos.go → cmd/integration-test/pkg/tests/talos.go
diff --git a/...ni-integration-test/pkg/tests/template.go → cmd/integration-test/pkg/tests/template.go b/...ni-integration-test/pkg/tests/template.go → cmd/integration-test/pkg/tests/template.go
diff --git a/...st/pkg/tests/testdata/cluster-1.tmpl.yaml → ...st/pkg/tests/testdata/cluster-1.tmpl.yaml b/...st/pkg/tests/testdata/cluster-1.tmpl.yaml → ...st/pkg/tests/testdata/cluster-1.tmpl.yaml
diff --git a/...st/pkg/tests/testdata/cluster-2.tmpl.yaml → ...st/pkg/tests/testdata/cluster-2.tmpl.yaml b/...st/pkg/tests/testdata/cluster-2.tmpl.yaml → ...st/pkg/tests/testdata/cluster-2.tmpl.yaml
diff --git a/cmd/omni-integration-test/pkg/tests/tests.go → cmd/integration-test/pkg/tests/tests.go b/cmd/omni-integration-test/pkg/tests/tests.go → cmd/integration-test/pkg/tests/tests.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/siderolabs/omni/client/api/omni/specs"
 	"github.com/siderolabs/omni/client/pkg/omni/resources/omni"
-	"github.com/siderolabs/omni/cmd/omni-integration-test/pkg/clientconfig"
+	"github.com/siderolabs/omni/cmd/integration-test/pkg/clientconfig"
 )
 
 // TestFunc is a testing function prototype.

diff --git a/cmd/omni-integration-test/pkg/tests/utils.go → cmd/integration-test/pkg/tests/utils.go b/cmd/omni-integration-test/pkg/tests/utils.go → cmd/integration-test/pkg/tests/utils.go
diff --git a/cmd/omni-integration-test/root.go → cmd/integration-test/root.go b/cmd/omni-integration-test/root.go → cmd/integration-test/root.go
@@ -18,8 +18,8 @@ import (
 	"github.com/spf13/cobra"
 
 	clientconsts "github.com/siderolabs/omni/client/pkg/constants"
-	"github.com/siderolabs/omni/cmd/omni-integration-test/pkg/clientconfig"
-	"github.com/siderolabs/omni/cmd/omni-integration-test/pkg/tests"
+	"github.com/siderolabs/omni/cmd/integration-test/pkg/clientconfig"
+	"github.com/siderolabs/omni/cmd/integration-test/pkg/tests"
 	"github.com/siderolabs/omni/internal/pkg/constants"
 )
 

diff --git a/hack/test/integration.sh b/hack/test/integration.sh
@@ -134,7 +134,7 @@ sleep 5
 # Run the integration test.
 
 SSL_CERT_DIR=hack/certs:/etc/ssl/certs \
-${ARTIFACTS}/omni-integration-test-linux-amd64 \
+${ARTIFACTS}/integration-test-linux-amd64 \
     --endpoint https://localhost:8099 \
     --talos-version=${TALOS_VERSION} \
     --expected-machines=8 `# equal to the masters+workers above` \

diff --git a/internal/frontend/frontend.go b/internal/frontend/frontend.go
@@ -5,7 +5,7 @@
 
 // THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 //
-// Generated on 2024-03-08T08:13:22Z by kres latest.
+// Generated on 2024-03-08T09:31:20Z by kres latest.
 
 package frontend