Merge branch 'main' of https://github.com/AI-Infra-Team/telego into main

Author: ActivePeter

app/job_img_repo.go

@@ -162,7 +162,7 @@ func (m ModJobImgRepoStruct) startImgRepo() error {
 	}
 	generateHarborConfig()
 
-	_, err = util.ModRunCmd.NewBuilder("bash", "install.sh").
+	_, err = util.ModRunCmd.NewBuilder(util.ShellExec(), "install.sh").
 		WithRoot().
 		ShowProgress().
 		SetDir("/teledeploy_secret/harbor/pack/harbor").

test/test4_img_repo/img_repo_test.go

@@ -35,24 +35,27 @@ func TestImgRepoSetup(t *testing.T) {
 	}
 
 	// rclone config to main node
-	cmd := testutil.NewPtyCommand(t, "rclone", "copy", "/tmp/img_repo", "remote:/teledeploy_secret")
+	cmd := testutil.NewPtyCommand(t, "rclone", "copy", "/tmp/img_repo", "remote:/teledeploy_secret/config")
 	cmd.Dir = projectRoot
-	if err = testutil.RunCommand(t, cmd); err != nil {
-		t.Fatalf("rclone to main node failed: %v", err)
+	testutil.RunCommand(t, cmd)
+	if testutil.GetPtyExitCode(t, cmd) != 0 {
+		t.Fatalf("rclone to main node failed")
 	}
 
 	// telego start img repo
 	cmd = testutil.NewPtyCommand(t, "telego", "img-repo")
 	cmd.Dir = projectRoot
-	if err = testutil.RunCommand(t, cmd); err != nil {
-		t.Fatalf("telego start img repo failed: %v", err)
+	testutil.RunCommand(t, cmd)
+	if testutil.GetPtyExitCode(t, cmd) != 0 {
+		t.Fatalf("telego start img repo failed")
 	}
 
 	// docker login
 	cmd = testutil.NewPtyCommand(t, "docker", "login", "127.0.0.1:5000", "-u", "testadmin", "-p", "testpassword")
 	cmd.Dir = projectRoot
-	if err = testutil.RunCommand(t, cmd); err != nil {
-		t.Fatalf("docker login failed: %v", err)
+	testutil.RunCommand(t, cmd)
+	if testutil.GetPtyExitCode(t, cmd) != 0 {
+		t.Fatalf("docker login failed")
 	}
 
 	t.Log("img repo started")

test/testutil/cmd.go

@@ -1,6 +1,7 @@
 package testutil
 
 import (
+	"os"
 	"os/exec"
 	"strconv"
 	"strings"
@@ -24,7 +25,7 @@ func NewPtyCommand(t *testing.T, name string, args ...string) *exec.Cmd {
 
 	fullCmd := append([]string{name}, args...)
 	cmdStr := shellEscapeArgs(fullCmd)
-	return exec.Command("script", "-q", "-c", cmdStr, "/dev/null")
+	return exec.Command("script", "-q", "-c", "sh -c '"+cmdStr+"'; echo $? > /tmp/test_exit_code", "/dev/null")
 }
 
 // shellEscapeArgs 将参数数组安全拼接成 shell 字符串
@@ -36,3 +37,11 @@ func shellEscapeArgs(args []string) string {
 	}
 	return strings.Join(escaped, " ")
 }
+
+func GetPtyExitCode(t *testing.T, cmd *exec.Cmd) int {
+	code, err := os.ReadFile("/tmp/test_exit_code")
+	if err != nil {
+		t.Fatalf("read exit code failed: %v", err)
+	}
+	return int(code[0])
+}

util/adminuser.go

@@ -3,11 +3,28 @@ package util
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 
 	"gopkg.in/yaml.v2"
 )
 
+func ShellExec() string {
+	maybeNames := []string{"bash", "sh", "fish", "ksh"}
+	for _, name := range maybeNames {
+		if _, err := exec.LookPath(name); err == nil {
+			return name
+		}
+	}
+	return "shell-not-found"
+	// // get which shell
+	// shell := os.Getenv("SHELL")
+	// if shell == "" {
+	// 	shell = "/bin/bash"
+	// }
+	// return shell
+}
+
 // AdminUserConfig 定义管理员用户配置的结构
 type AdminUserConfig struct {
 	Username string `yaml:"username"`