• R/O
  • HTTP
  • SSH
  • HTTPS

提交

標籤
無標籤

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

the default GitOps source repository for booting up Jenkins X


Commit MetaInfo

修訂04af89b480881e588815c9f492e92e5eac37da48 (tree)
時間2019-09-04 20:56:52
作者Pete Muir <pmuir@blee...>
CommiterPete Muir

Log Message

fix: use namespace from jx-requirements

fixes jenkins-x/jx#5034

Change Summary

差異

--- a/jenkins-x-bdd-local.yml
+++ b/jenkins-x-bdd-local.yml
@@ -16,7 +16,7 @@ pipelineConfig:
1616 - name: GOPROXY
1717 value: http://jenkins-x-athens-proxy:80
1818 agent:
19- image: gcr.io/jenkinsxio/builder-go-maven:0.1.686
19+ image: gcr.io/jenkinsxio/builder-go-maven:0.1.714
2020 stages:
2121 - name: ci
2222 steps:
--- a/jenkins-x-bdd-vault.yml
+++ b/jenkins-x-bdd-vault.yml
@@ -16,7 +16,7 @@ pipelineConfig:
1616 - name: GOPROXY
1717 value: http://jenkins-x-athens-proxy:80
1818 agent:
19- image: gcr.io/jenkinsxio/builder-go-maven:0.1.686
19+ image: gcr.io/jenkinsxio/builder-go-maven:0.1.714
2020 stages:
2121 - name: ci
2222 steps:
--- a/jenkins-x.yml
+++ b/jenkins-x.yml
@@ -4,10 +4,7 @@ pipelineConfig:
44 release:
55 pipeline:
66 agent:
7- image: gcr.io/jenkinsxio/builder-go:0.1.686
8- environment:
9- - name: DEPLOY_NAMESPACE
10- value: jx
7+ image: gcr.io/jenkinsxio/builder-go:0.1.714
118 stages:
129 - name: release
1310 steps:
@@ -25,10 +22,7 @@ pipelineConfig:
2522 - name: install-nginx
2623 dir: /workspace/source/systems/jxing
2724 command: jx
28- args: ['step','helm','apply', '--boot', '--remote', '--no-vault', '--name', 'jxing']
29- env:
30- - name: DEPLOY_NAMESPACE
31- value: kube-system
25+ args: ['step','helm','apply', '--boot', '--remote', '--no-vault', '--name', 'jxing', '--namespace', 'kube-system']
3226 - name: create-install-values
3327 dir: /workspace/source/env
3428 command: jx
@@ -41,16 +35,10 @@ pipelineConfig:
4135 dir: /workspace/source
4236 command: kubectl
4337 args: ['apply', '--wait', '--validate=true', '-f', 'https://raw.githubusercontent.com/jetstack/cert-manager/release-0.8/deploy/manifests/00-crds.yaml']
44- env:
45- - name: DEPLOY_NAMESPACE
46- value: cert-manager
4738 - name: install-cert-manager
4839 dir: /workspace/source/systems/cm
4940 command: jx
50- args: ['step','helm','apply', '--boot', '--remote', '--no-vault', '--name', 'jx']
51- env:
52- - name: DEPLOY_NAMESPACE
53- value: cert-manager
41+ args: ['step','helm','apply', '--boot', '--remote', '--no-vault', '--name', 'jx', '--namespace', 'cert-manager']
5442 - name: install-acme-issuer-and-certificate
5543 dir: /workspace/source/systems/acme
5644 command: jx
@@ -99,7 +87,7 @@ pipelineConfig:
9987 pullRequest:
10088 pipeline:
10189 agent:
102- image: gcr.io/jenkinsxio/builder-go:0.1.686
90+ image: gcr.io/jenkinsxio/builder-go:0.1.714
10391 stages:
10492 - name: pr
10593 steps:
@@ -107,4 +95,3 @@ pipelineConfig:
10795 dir: /workspace/source/env
10896 command: make
10997 args: ['build']
110-