diff options
4 files changed, 14 insertions, 10 deletions
diff --git a/jjb/yaml/verizoncloudplatform.com/ob-promote-branch-pipeline.yaml b/jjb/yaml/verizoncloudplatform.com/ob-promote-branch-pipeline.yaml index 6ebf767..686cf0f 100644 --- a/jjb/yaml/verizoncloudplatform.com/ob-promote-branch-pipeline.yaml +++ b/jjb/yaml/verizoncloudplatform.com/ob-promote-branch-pipeline.yaml @@ -5,16 +5,20 @@ - "ob-promote-branch-{src}-{dest}-ob-pipeline": src: "unstable" dest: "develop" + token: "C1E4270DBF346C1079D9CB2D9A798F15" - "ob-promote-branch-{src}-{dest}-ob-pipeline": src: "develop" dest: "stage" + token: "E33114B6B8BDFA42FDCF0AB3E7C01B04" - "ob-promote-branch-{src}-{dest}-ob-pipeline": src: "stage" dest: "master" + token: "A11B7C4C3AB3E3E77A2C8AADEAB6FC97" - job-template: name: "ob-promote-branch-{src}-{dest}-ob-pipeline" project-type: pipeline + auth-token: "{token}" dsl: | pipeline {{ agent {{ @@ -27,43 +31,43 @@ stage("openbook-core") {{ steps {{ git(poll: false, branch: "{dest}", url: "git@github.com:Talligent/openbook-core.git") - sh(script: "git push origin {src}:{dest}") + sh(script: "git push origin remotes/origin/{src}:{dest}") }} }} stage("admin-api-server") {{ steps {{ git(poll: false, branch: "{dest}", url: "git@github.com:Talligent/admin-api-server.git") - sh(script: "git push origin {src}:{dest}") + sh(script: "git push origin remotes/origin/{src}:{dest}") }} }} stage("admin-web-ui") {{ steps {{ git(poll: false, branch: "{dest}", url: "git@github.com:Talligent/admin-web-ui.git") - sh(script: "git push origin {src}:{dest}") + sh(script: "git push origin remotes/origin/{src}:{dest}") }} }} stage("customer-api-server") {{ steps {{ git(poll: false, branch: "{dest}", url: "git@github.com:Talligent/customer-api-server.git") - sh(script: "git push origin {src}:{dest}") + sh(script: "git push origin remotes/origin/{src}:{dest}") }} }} stage("customer-web-ui") {{ steps {{ git(poll: false, branch: "{dest}", url: "git@github.com:Talligent/customer-web-ui.git") - sh(script: "git push origin {src}:{dest}") + sh(script: "git push origin remotes/origin/{src}:{dest}") }} }} stage("job-scheduler-server") {{ steps {{ git(poll: false, branch: "{dest}", url: "git@github.com:Talligent/job-scheduler-server.git") - sh(script: "git push origin {src}:{dest}") + sh(script: "git push origin remotes/origin/{src}:{dest}") }} }} stage("workflow-server") {{ steps {{ git(poll: false, branch: "{dest}", url: "git@github.com:Talligent/workflow-server.git") - sh(script: "git push origin {src}:{dest}") + sh(script: "git push origin remotes/origin/{src}:{dest}") }} }} }} diff --git a/salt/openbook/ansible/files/env.yaml.docker_registry.example b/salt/openbook/ansible/files/env.yaml.docker_registry.example index f027328..7bbb6d9 100644 --- a/salt/openbook/ansible/files/env.yaml.docker_registry.example +++ b/salt/openbook/ansible/files/env.yaml.docker_registry.example @@ -2,7 +2,7 @@ globals: ansible_ssh_user: root ansible_private_key_file: /var/lib/jenkins/.ssh/id_rsa - ansible_python_interpreter: /usr/bin/python2 + ansible_python_interpreter: /usr/bin/python environments: - master: diff --git a/salt/openbook/ansible/files/env.yaml.openbook.example b/salt/openbook/ansible/files/env.yaml.openbook.example index c4bca63..3d04366 100644 --- a/salt/openbook/ansible/files/env.yaml.openbook.example +++ b/salt/openbook/ansible/files/env.yaml.openbook.example @@ -2,7 +2,7 @@ globals: ansible_ssh_user: root ansible_private_key_file: /var/lib/jenkins/.ssh/id_rsa - ansible_python_interpreter: /usr/bin/python2 + ansible_python_interpreter: /usr/bin/python openbook_docker_registry_url: ~ openbook_docker_registry_username: ~ openbook_docker_registry_password: ~ diff --git a/salt/openbook/ansible/files/env.yaml.openbook_docker_slave.example b/salt/openbook/ansible/files/env.yaml.openbook_docker_slave.example index 51592e9..1f74e5e 100644 --- a/salt/openbook/ansible/files/env.yaml.openbook_docker_slave.example +++ b/salt/openbook/ansible/files/env.yaml.openbook_docker_slave.example @@ -2,7 +2,7 @@ globals: ansible_ssh_user: root ansible_private_key_file: /var/lib/jenkins/.ssh/id_rsa - ansible_python_interpreter: /usr/bin/python2 + ansible_python_interpreter: /usr/bin/python locale: en_US.utf8 salt_master: localhost |