diff --git a/runtime/main.go b/runtime/main.go index 8d5fedd2c47fdb28dc85c7fb885bdacf3867c36b..96567e99015777824c0cdd45b57ddd2925bd75eb 100644 --- a/runtime/main.go +++ b/runtime/main.go @@ -190,19 +190,11 @@ var execRunc = func() error { return nil } -func addEnvToDevicePlugin(spec *specs.Spec) { - if spec.Process.Env == nil { +func addAscendDockerEnv(spec *specs.Spec) { + if spec == nil || spec.Process == nil || spec.Process.Env == nil { return } - - for _, line := range spec.Process.Env { - words := strings.Split(line, "=") - if len(words) == envLength && strings.TrimSpace(words[0]) == "HOSTNAME" && - strings.Contains(words[1], devicePlugin) { - spec.Process.Env = append(spec.Process.Env, useAscendDocker) - break - } - } + spec.Process.Env = append(spec.Process.Env, useAscendDocker) } func addHook(spec *specs.Spec) error { @@ -640,7 +632,7 @@ func modifySpecFile(path string) error { } } - addEnvToDevicePlugin(&spec) + addAscendDockerEnv(&spec) jsonOutput, err := json.Marshal(spec) if err != nil { diff --git a/runtime/main_test.go b/runtime/main_test.go index c540f8b45f61ea1e6ce987fc633783460984b159..35e0221cd61dc710a71a2db8bbc8e0df4025eb52 100644 --- a/runtime/main_test.go +++ b/runtime/main_test.go @@ -275,7 +275,7 @@ func TestAddEnvToDevicePlugin0(t *testing.T) { }, } - addEnvToDevicePlugin(&spec) + addAscendDockerEnv(&spec) assert.Contains(t, spec.Process.Env, useAscendDocker) } @@ -289,8 +289,8 @@ func TestAddEnvToDevicePlugin1(t *testing.T) { }, } - addEnvToDevicePlugin(&spec) - assert.NotContains(t, spec.Process.Env, useAscendDocker) + addAscendDockerEnv(&spec) + assert.Contains(t, spec.Process.Env, useAscendDocker) } func TestGetDeviceTypeByChipName0(t *testing.T) {