Skip to content

Commit 208f180

Browse files
committed
upgrade* jenkins runtime vars use envVars uniformly
1 parent 5255a97 commit 208f180

File tree

5 files changed

+4
-14
lines changed

5 files changed

+4
-14
lines changed

jenkins/config.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ import "github.com/go-atomci/workflow"
2020

2121
// CommonContext ..
2222
type CommonContext struct {
23-
JenkinsSlaveWorkspace string
24-
AccessToken string
25-
RepoCnf string
26-
AtomCIServer string
23+
Namespace string
2724
}
2825

2926
// CallbackRequest ..
@@ -58,9 +55,6 @@ type ContainerEnv struct {
5855
// CIContext ..
5956
type CIContext struct {
6057
CommonContext
61-
RegistryAddr string
62-
DockerConfig string
63-
DockerAuth string
6458
Stages string
6559
EnvVars []EnvItem
6660
ContainerTemplates []ContainerEnv

jenkins/jenkins_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ func TestGetStatus(t *testing.T) {
4747
pipelineStagesStr := strings.Join(taskPipelineXMLStrArr, " ")
4848

4949
CIContext := CIContext{
50-
RegistryAddr: "",
5150
EnvVars: []EnvItem{
5251
{Key: "JENKINS_SLAVE_WORKSPACE", Value: "/tmp"},
5352
{Key: "ACCESS_TOKEN", Value: "dddxxx"},

jenkins/templates/cipipeline.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pipeline {
2626
apiVersion: v1
2727
kind: Pod
2828
metadata:
29-
namespace: devops
29+
namespace: {{ .Namespace }}
3030
spec:
3131
containers:
3232
{{- range $i, $item := .ContainerTemplates }}

jenkins/templates/deploy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pipeline {
2626
apiVersion: v1
2727
kind: Pod
2828
metadata:
29-
namespace: devops
29+
namespace: {{ .Namespace }}
3030
spec:
3131
containers:
3232
{{- range $i, $item := .ContainerTemplates }}

sample/sample.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,11 @@ func SamplePipeline(addr, user, token string) error {
9898
// Notes
9999
// pipelineStageStr: you can use `jenkins.GeneratePipelineXMLStr()` get the defined of pipelineXmlStr.
100100
flowProcessor := &jenkins.CIContext{
101-
RegistryAddr: "192.168.2.10:5000",
102101
EnvVars: envVars,
103102
ContainerTemplates: containerTemplates,
104103
Stages: GetPipelineXMLStr(),
105104
CommonContext: jenkins.CommonContext{
106-
JenkinsSlaveWorkspace: "CIInfo[3]",
107-
AccessToken: "adminToken",
108-
AtomCIServer: "atomciServer",
105+
Namespace: "devops",
109106
},
110107
CallBack: jenkins.CallbackRequest{
111108
Token: token,

0 commit comments

Comments
 (0)