upgrade* jenkins runtime vars use envVars uniformly

go-atomci · Nov 26, 2021 · 208f180 · 208f180
1 parent 5255a97
commit 208f180
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 14 deletions.
diff --git a/jenkins/config.go b/jenkins/config.go
@@ -20,10 +20,7 @@ import "github.com/go-atomci/workflow"
 
 // CommonContext ..
 type CommonContext struct {
-	JenkinsSlaveWorkspace string
-	AccessToken           string
-	RepoCnf               string
-	AtomCIServer          string
+	Namespace string
 }
 
 // CallbackRequest ..
@@ -58,9 +55,6 @@ type ContainerEnv struct {
 // CIContext ..
 type CIContext struct {
 	CommonContext
-	RegistryAddr       string
-	DockerConfig       string
-	DockerAuth         string
 	Stages             string
 	EnvVars            []EnvItem
 	ContainerTemplates []ContainerEnv

diff --git a/jenkins/jenkins_test.go b/jenkins/jenkins_test.go
@@ -47,7 +47,6 @@ func TestGetStatus(t *testing.T) {
 	pipelineStagesStr := strings.Join(taskPipelineXMLStrArr, " ")
 
 	CIContext := CIContext{
-		RegistryAddr: "",
 		EnvVars: []EnvItem{
 			{Key: "JENKINS_SLAVE_WORKSPACE", Value: "/tmp"},
 			{Key: "ACCESS_TOKEN", Value: "dddxxx"},

diff --git a/jenkins/templates/cipipeline.go b/jenkins/templates/cipipeline.go
@@ -26,7 +26,7 @@ pipeline {
 apiVersion: v1
 kind: Pod
 metadata:
-  namespace: devops
+  namespace: {{ .Namespace }}
 spec:
   containers:
   {{- range $i, $item := .ContainerTemplates }}

diff --git a/jenkins/templates/deploy.go b/jenkins/templates/deploy.go
@@ -26,7 +26,7 @@ pipeline {
 apiVersion: v1
 kind: Pod
 metadata:
-  namespace: devops
+  namespace: {{ .Namespace }}
 spec:
   containers:
   {{- range $i, $item := .ContainerTemplates }}

diff --git a/sample/sample.go b/sample/sample.go
@@ -98,14 +98,11 @@ func SamplePipeline(addr, user, token string) error {
 	// Notes
 	// pipelineStageStr: you can use `jenkins.GeneratePipelineXMLStr()` get the defined of pipelineXmlStr.
 	flowProcessor := &jenkins.CIContext{
-		RegistryAddr:       "192.168.2.10:5000",
 		EnvVars:            envVars,
 		ContainerTemplates: containerTemplates,
 		Stages:             GetPipelineXMLStr(),
 		CommonContext: jenkins.CommonContext{
-			JenkinsSlaveWorkspace: "CIInfo[3]",
-			AccessToken:           "adminToken",
-			AtomCIServer:          "atomciServer",
+			Namespace: "devops",
 		},
 		CallBack: jenkins.CallbackRequest{
 			Token: token,