Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
33d459aa
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
33d459aa
编写于
3月 14, 2018
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
DRY remaining instances of predefined variables
上级
1d57db0d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
35 addition
and
34 deletion
+35
-34
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+4
-5
app/models/ci/runner.rb
app/models/ci/runner.rb
+4
-5
app/models/clusters/platforms/kubernetes.rb
app/models/clusters/platforms/kubernetes.rb
+12
-12
app/models/environment.rb
app/models/environment.rb
+3
-4
app/models/project_services/kubernetes_service.rb
app/models/project_services/kubernetes_service.rb
+12
-8
未找到文件。
app/models/ci/pipeline.rb
浏览文件 @
33d459aa
...
...
@@ -473,11 +473,10 @@ module Ci
end
def
predefined_variables
[
{
key:
'CI_PIPELINE_ID'
,
value:
id
.
to_s
,
public:
true
},
{
key:
'CI_CONFIG_PATH'
,
value:
ci_yaml_file_path
,
public:
true
},
{
key:
'CI_PIPELINE_SOURCE'
,
value:
source
.
to_s
,
public:
true
}
]
Gitlab
::
Ci
::
Variables
::
Collection
.
new
.
append
(
key:
'CI_PIPELINE_ID'
,
value:
id
.
to_s
)
.
append
(
key:
'CI_CONFIG_PATH'
,
value:
ci_yaml_file_path
)
.
append
(
key:
'CI_PIPELINE_SOURCE'
,
value:
source
.
to_s
)
end
def
queued_duration
...
...
app/models/ci/runner.rb
浏览文件 @
33d459aa
...
...
@@ -132,11 +132,10 @@ module Ci
end
def
predefined_variables
[
{
key:
'CI_RUNNER_ID'
,
value:
id
.
to_s
,
public:
true
},
{
key:
'CI_RUNNER_DESCRIPTION'
,
value:
description
,
public:
true
},
{
key:
'CI_RUNNER_TAGS'
,
value:
tag_list
.
to_s
,
public:
true
}
]
Gitlab
::
Ci
::
Variables
::
Collection
.
new
.
append
(
key:
'CI_RUNNER_ID'
,
value:
id
.
to_s
)
.
append
(
key:
'CI_RUNNER_DESCRIPTION'
,
value:
description
)
.
append
(
key:
'CI_RUNNER_TAGS'
,
value:
tag_list
.
to_s
)
end
def
tick_runner_queue
...
...
app/models/clusters/platforms/kubernetes.rb
浏览文件 @
33d459aa
...
...
@@ -56,19 +56,19 @@ module Clusters
def
predefined_variables
config
=
YAML
.
dump
(
kubeconfig
)
variables
=
[
{
key:
'KUBE_URL'
,
value:
api_url
,
public:
true
},
{
key:
'KUBE_TOKEN'
,
value:
token
,
public:
false
},
{
key:
'KUBE_NAMESPACE'
,
value:
actual_namespace
,
public:
true
},
{
key:
'KUBECONFIG'
,
value:
config
,
public:
false
,
file:
true
}
]
if
ca_pem
.
present?
variables
<<
{
key:
'KUBE_CA_PEM'
,
value:
ca_pem
,
public:
true
}
variables
<<
{
key:
'KUBE_CA_PEM_FILE'
,
value:
ca_pem
,
public:
true
,
file:
true
}
Gitlab
::
Ci
::
Variables
::
Collection
.
new
.
tap
do
|
variables
|
variables
.
append
(
key:
'KUBE_URL'
,
value:
api_url
)
.
append
(
key:
'KUBE_TOKEN'
,
value:
token
,
public:
false
)
.
append
(
key:
'KUBE_NAMESPACE'
,
value:
actual_namespace
)
.
append
(
key:
'KUBECONFIG'
,
value:
config
,
public:
false
,
file:
true
)
if
ca_pem
.
present?
variables
.
append
(
key:
'KUBE_CA_PEM'
,
value:
ca_pem
)
.
append
(
key:
'KUBE_CA_PEM_FILE'
,
value:
ca_pem
,
file:
true
)
end
end
variables
end
# Constructs a list of terminals from the reactive cache
...
...
app/models/environment.rb
浏览文件 @
33d459aa
...
...
@@ -65,10 +65,9 @@ class Environment < ActiveRecord::Base
end
def
predefined_variables
[
{
key:
'CI_ENVIRONMENT_NAME'
,
value:
name
,
public:
true
},
{
key:
'CI_ENVIRONMENT_SLUG'
,
value:
slug
,
public:
true
}
]
Gitlab
::
Ci
::
Variables
::
Collection
.
new
.
append
(
key:
'CI_ENVIRONMENT_NAME'
,
value:
name
)
.
append
(
key:
'CI_ENVIRONMENT_SLUG'
,
value:
slug
)
end
def
recently_updated_on_branch?
(
ref
)
...
...
app/models/project_services/kubernetes_service.rb
浏览文件 @
33d459aa
...
...
@@ -105,14 +105,18 @@ class KubernetesService < DeploymentService
def
predefined_variables
config
=
YAML
.
dump
(
kubeconfig
)
Gitlab
::
Ci
::
Variables
::
Collection
.
new
.
tap
do
|
collection
|
collection
.
append
(
key:
'KUBE_URL'
,
value:
api_url
,
public:
true
)
collection
.
append
(
key:
'KUBE_TOKEN'
,
value:
token
,
public:
false
)
collection
.
append
(
key:
'KUBE_NAMESPACE'
,
value:
actual_namespace
,
public:
true
)
collection
.
append
(
key:
'KUBECONFIG'
,
value:
config
,
public:
false
,
file:
true
)
collection
.
append
(
key:
'KUBE_CA_PEM'
,
value:
ca_pem
,
public:
true
)
collection
.
append
(
key:
'KUBE_CA_PEM_FILE'
,
value:
ca_pem
,
public:
true
,
file:
true
)
Gitlab
::
Ci
::
Variables
::
Collection
.
new
.
tap
do
|
variables
|
variables
.
append
(
key:
'KUBE_URL'
,
value:
api_url
)
.
append
(
key:
'KUBE_TOKEN'
,
value:
token
,
public:
false
)
.
append
(
key:
'KUBE_NAMESPACE'
,
value:
actual_namespace
)
.
append
(
key:
'KUBECONFIG'
,
value:
config
,
public:
false
,
file:
true
)
if
ca_pem
.
present?
variables
.
append
(
key:
'KUBE_CA_PEM'
,
value:
ca_pem
)
.
append
(
key:
'KUBE_CA_PEM_FILE'
,
value:
ca_pem
,
file:
true
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录