Revert test changes

kurtosis-tech · Jun 11, 2024 · c10003c · c10003c
1 parent 78b175f
commit c10003c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 19 deletions.
diff --git a/cli/cli/.goreleaser.yml b/cli/cli/.goreleaser.yml
@@ -18,21 +18,21 @@ builds:
       - CGO_ENABLED={{ if eq .Os "windows" }}0{{ else }}1{{ end }}
       # Only override compilers if we are on CI, otherwise use the locally available C/C++ toolchain
       - >-
-          {{- if index .Env "CI" }}
-            {{- if eq .Os "darwin" }}CC=o64h-clang{{- end }}
-            {{- if eq .Os "linux" }}
-              {{- if eq .Arch "amd64"}}CC=x86_64-linux-musl-gcc{{- end }}
-                {{- if eq .Arch "arm64"}}CC=aarch64-linux-musl-gcc{{- end }}
-            {{- end }}
+        {{- if index .Env "CI" }}
+          {{- if eq .Os "darwin" }}CC=o64h-clang{{- end }}
+          {{- if eq .Os "linux" }}
+            {{- if eq .Arch "amd64"}}CC=x86_64-linux-musl-gcc{{- end }}
+              {{- if eq .Arch "arm64"}}CC=aarch64-linux-musl-gcc{{- end }}
           {{- end }}
+        {{- end }}
       - >-
-          {{- if index .Env "CI" }}
-            {{- if eq .Os "darwin" }}CXX=o64h-clang++{{- end }}
-            {{- if eq .Os "linux" }}
-              {{- if eq .Arch "amd64"}}CXX=x86_64-linux-musl-g++{{- end }}
-                {{- if eq .Arch "arm64"}}CXX=aarch64-linux-musl-g++{{- end }}
-            {{- end }}
+        {{- if index .Env "CI" }}
+          {{- if eq .Os "darwin" }}CXX=o64h-clang++{{- end }}
+          {{- if eq .Os "linux" }}
+            {{- if eq .Arch "amd64"}}CXX=x86_64-linux-musl-g++{{- end }}
+              {{- if eq .Arch "arm64"}}CXX=aarch64-linux-musl-g++{{- end }}
           {{- end }}
+        {{- end }}
     ldflags:
       - >-
         {{- if eq .Os "linux" }}-linkmode external -extldflags "-static"{{- end }}

diff --git a/core/files_artifacts_expander/scripts/build.sh b/core/files_artifacts_expander/scripts/build.sh
@@ -26,7 +26,7 @@ DEFAULT_DEBUG_IMAGE=false
 if [ "$uname_arch" == "x86_64" ] || [ "$uname_arch" == "amd64" ]; then
     DEFAULT_ARCHITECTURE_TO_BUILD="amd64"
 elif [ "$uname_arch" == "aarch64" ] || [ "$uname_arch" == "arm64" ]; then
-    DEFAULT_ARCHITECTURE_TO_BUILD="amd64"
+    DEFAULT_ARCHITECTURE_TO_BUILD="arm64"
 fi
 
 MAIN_GO_FILEPATH="${expander_root_dirpath}/main.go"

diff --git a/core/launcher/api_container_launcher/api_container_launcher.go b/core/launcher/api_container_launcher/api_container_launcher.go
@@ -11,7 +11,7 @@ import (
 	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/api_container"
 	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/enclave"
 	"github.com/kurtosis-tech/kurtosis/core/launcher/args"
-	//"github.com/kurtosis-tech/kurtosis/kurtosis_version"
+	"github.com/kurtosis-tech/kurtosis/kurtosis_version"
 	"github.com/kurtosis-tech/kurtosis/metrics-library/golang/lib/metrics_client"
 	"github.com/kurtosis-tech/stacktrace"
 	"github.com/sirupsen/logrus"
@@ -52,7 +52,7 @@ func (launcher ApiContainerLauncher) LaunchWithDefaultVersion(
 ) {
 	resultApiContainer, err := launcher.LaunchWithCustomVersion(
 		ctx,
-		"latest",
+		kurtosis_version.KurtosisVersion,
 		logLevel,
 		enclaveId,
 		grpcListenPort,
@@ -67,7 +67,7 @@ func (launcher ApiContainerLauncher) LaunchWithDefaultVersion(
 		shouldStartInDebugMode,
 	)
 	if err != nil {
-		return nil, stacktrace.Propagate(err, "An error occurred launching the API container with default version tag '%v'", "latest")
+		return nil, stacktrace.Propagate(err, "An error occurred launching the API container with default version tag '%v'", kurtosis_version.KurtosisVersion)
 	}
 	return resultApiContainer, nil
 }

diff --git a/core/launcher/go.mod b/core/launcher/go.mod
@@ -9,6 +9,7 @@ replace (
 
 require (
 	github.com/kurtosis-tech/kurtosis/container-engine-lib v0.0.0 // Local dependency
+	github.com/kurtosis-tech/kurtosis/kurtosis_version v0.0.0 // Local dependency generated during build
 	github.com/kurtosis-tech/stacktrace v0.0.0-20211028211901-1c67a77b5409
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.8.4

diff --git a/core/server/scripts/build.sh b/core/server/scripts/build.sh
@@ -14,7 +14,7 @@ source "${script_dirpath}/_constants.env"
 if [ "$uname_arch" == "x86_64" ] || [ "$uname_arch" == "amd64" ]; then
     DEFAULT_ARCHITECTURE_TO_BUILD="amd64"
 elif [ "$uname_arch" == "aarch64" ] || [ "$uname_arch" == "arm64" ]; then
-    DEFAULT_ARCHITECTURE_TO_BUILD="amd64"
+    DEFAULT_ARCHITECTURE_TO_BUILD="arm64"
 fi
 
 MAIN_DIRNAME="api_container"

diff --git a/engine/server/go.mod b/engine/server/go.mod
@@ -99,6 +99,7 @@ require (
 	github.com/kurtosis-tech/kurtosis/cloud/api/golang v0.0.0-20230828153722-32770ca96513 // indirect
 	github.com/kurtosis-tech/kurtosis/contexts-config-store v0.0.0 // indirect
 	github.com/kurtosis-tech/kurtosis/enclave-manager/api/golang v0.0.0-20230828153722-32770ca96513 // indirect
+	github.com/kurtosis-tech/kurtosis/kurtosis_version v0.0.0 // indirect
 	github.com/kurtosis-tech/kurtosis/path-compression v0.0.0-20240307154559-64d2929cd265 // indirect
 	github.com/labstack/gommon v0.4.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect

diff --git a/engine/server/scripts/build.sh b/engine/server/scripts/build.sh
@@ -14,7 +14,7 @@ source "${script_dirpath}/_constants.env"
 if [ "$uname_arch" == "x86_64" ] || [ "$uname_arch" == "amd64" ]; then
     DEFAULT_ARCHITECTURE_TO_BUILD="amd64"
 elif [ "$uname_arch" == "aarch64" ] || [ "$uname_arch" == "arm64" ]; then
-    DEFAULT_ARCHITECTURE_TO_BUILD="amd64"
+    DEFAULT_ARCHITECTURE_TO_BUILD="arm64"
 fi
 
 MAIN_DIRNAME="engine"

diff --git a/scripts/docker-image-builder.sh b/scripts/docker-image-builder.sh
@@ -43,7 +43,7 @@ architecture="amd64"
 if [ "$uname_arch" == "x86_64" ] || [ "$uname_arch" == "amd64" ]; then
     architecture="amd64"
 elif [ "$uname_arch" == "aarch64" ] || [ "$uname_arch" == "arm64" ]; then
-    architecture="amd64"
+    architecture="arm64"
 fi
 
 # Argument processing