Skip to content

Commit 9fa8f9a

Browse files
janiszjanisz
authored
Merge branch 'master' into renovate/semantic-release-jira-3.x
2 parents 1da4b5a + 1546c2e commit 9fa8f9a

File tree

249 files changed

+4450
-6112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+4450
-6112
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,9 @@ What needs to happen before this can be merged? e.g. PRs merged, other events
2323
<!--
2424
Would a visual be helpful for reviewers? e.g. "Before" and "After", visual changes a designer can check before merge
2525
-->
26+
27+
## Things to consider
28+
29+
- [] Integration tests
30+
- [] System tests
31+
- [] Does it need a feature flag?

‎Jenkinsfile‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,13 @@ pipeline {
8989
steps { sh "npm run test -- --runInBand --testPathIgnorePatterns tslint typecheck" }
9090
}
9191
stage("Integration Test") {
92-
environment {
93-
JUNIT_NAME = "integration"
94-
}
9592
steps {
9693
sh "npm run test:integration"
9794
}
9895

9996
post {
10097
always {
10198
archiveArtifacts "cypress/**/*"
102-
junit "cypress/result-${JUNIT_NAME}.xml"
10399
}
104100
}
105101
}
@@ -108,7 +104,6 @@ pipeline {
108104
environment {
109105
DCOS_DIR = "/tmp/.dcos-OSS-latest"
110106
PROXY_PORT = "4201"
111-
JUNIT_NAME = "oss-master"
112107
TERRAFORM_DIR = "./scripts/terraform-oss-latest"
113108
TF_VAR_cluster_name = "ui-oss-${cluster_suffix}-${BUILD_NUMBER}"
114109
TF_VAR_custom_dcos_download_path = "https://downloads.dcos.io/dcos/testing/master/dcos_generate_config.sh"
@@ -132,15 +127,13 @@ pipeline {
132127
sh "cd $TERRAFORM_DIR && ./down.sh"
133128
}
134129
archiveArtifacts "cypress/**/*"
135-
junit "cypress/result-${JUNIT_NAME}.xml"
136130
}
137131
}
138132
}
139133
stage("EE") {
140134
environment {
141135
DCOS_DIR = "/tmp/.dcos-EE-master"
142136
PROXY_PORT = "4202"
143-
JUNIT_NAME = "ee-master"
144137
TERRAFORM_DIR = "./scripts/terraform-ee-master"
145138
TF_VAR_cluster_name = "ui-ee-${cluster_suffix}-${BUILD_NUMBER}"
146139
TF_VAR_custom_dcos_download_path = "https://downloads.mesosphere.com/dcos-enterprise/testing/master/dcos_generate_config.ee.sh"
@@ -169,7 +162,6 @@ pipeline {
169162
sh "cd $TERRAFORM_DIR && ./down.sh"
170163
}
171164
archiveArtifacts "cypress/**/*"
172-
junit "cypress/result-${JUNIT_NAME}.xml"
173165
}
174166
}
175167
}
@@ -183,7 +175,6 @@ pipeline {
183175
environment {
184176
DCOS_DIR = "/tmp/.dcos-OSS-2.1"
185177
PROXY_PORT = "4300"
186-
JUNIT_NAME = "oss-2.1"
187178
TERRAFORM_DIR = "./scripts/terraform-oss-2.1"
188179
TF_VAR_cluster_name = "ui-21oss-${cluster_suffix}-${BUILD_NUMBER}"
189180
TF_VAR_custom_dcos_download_path = "https://downloads.dcos.io/dcos/stable/2.1.0/dcos_generate_config.sh"
@@ -207,15 +198,13 @@ pipeline {
207198
sh "cd $TERRAFORM_DIR && ./down.sh"
208199
}
209200
archiveArtifacts "cypress/**/*"
210-
junit "cypress/result-${JUNIT_NAME}.xml"
211201
}
212202
}
213203
}
214204
stage("EE") {
215205
environment {
216206
DCOS_DIR = "/tmp/.dcos-EE-2.1"
217207
PROXY_PORT = "4301"
218-
JUNIT_NAME = "ee-2.1"
219208
TERRAFORM_DIR = "./scripts/terraform-ee-2.1"
220209
TF_VAR_cluster_name = "ui-21ee-${cluster_suffix}-${BUILD_NUMBER}"
221210
TF_VAR_custom_dcos_download_path = "https://downloads.mesosphere.com/dcos-enterprise/stable/2.1.0/dcos_generate_config.ee.sh"
@@ -244,7 +233,6 @@ pipeline {
244233
sh "cd $TERRAFORM_DIR && ./down.sh"
245234
}
246235
archiveArtifacts "cypress/**/*"
247-
junit "cypress/result-${JUNIT_NAME}.xml"
248236
}
249237
}
250238
}
@@ -258,7 +246,6 @@ pipeline {
258246
environment {
259247
DCOS_DIR = "/tmp/.dcos-OSS-2.0"
260248
PROXY_PORT = "4400"
261-
JUNIT_NAME = "oss-2.0"
262249
TERRAFORM_DIR = "./scripts/terraform-oss-2.0"
263250
TF_VAR_cluster_name = "ui-20oss-${cluster_suffix}-${BUILD_NUMBER}"
264251
TF_VAR_custom_dcos_download_path = "https://downloads.dcos.io/dcos/stable/2.0.4/dcos_generate_config.sh"
@@ -282,15 +269,13 @@ pipeline {
282269
sh "cd $TERRAFORM_DIR && ./down.sh"
283270
}
284271
archiveArtifacts "cypress/**/*"
285-
junit "cypress/result-${JUNIT_NAME}.xml"
286272
}
287273
}
288274
}
289275
stage("EE") {
290276
environment {
291277
DCOS_DIR = "/tmp/.dcos-EE-2.0"
292278
PROXY_PORT = "4401"
293-
JUNIT_NAME = "ee-2.0"
294279
TERRAFORM_DIR = "./scripts/terraform-ee-2.0"
295280
TF_VAR_cluster_name = "ui-20ee-${cluster_suffix}-${BUILD_NUMBER}"
296281
TF_VAR_custom_dcos_download_path = "https://downloads.mesosphere.com/dcos-enterprise/stable/2.0.4/dcos_generate_config.ee.sh"
@@ -319,7 +304,6 @@ pipeline {
319304
sh "cd $TERRAFORM_DIR && ./down.sh"
320305
}
321306
archiveArtifacts "cypress/**/*"
322-
junit "cypress/result-${JUNIT_NAME}.xml"
323307
}
324308
}
325309
}
@@ -333,7 +317,6 @@ pipeline {
333317
environment {
334318
DCOS_DIR = "/tmp/.dcos-OSS-1.13"
335319
PROXY_PORT = "4500"
336-
JUNIT_NAME = "oss-1.13"
337320
TERRAFORM_DIR = "./scripts/terraform-oss-1.13"
338321
TF_VAR_cluster_name = "ui-113oss-${cluster_suffix}-${BUILD_NUMBER}"
339322
TF_VAR_custom_dcos_download_path = "https://downloads.dcos.io/dcos/stable/1.13.7/dcos_generate_config.sh"
@@ -357,15 +340,13 @@ pipeline {
357340
sh "cd $TERRAFORM_DIR && ./down.sh"
358341
}
359342
archiveArtifacts "cypress/**/*"
360-
junit "cypress/result-${JUNIT_NAME}.xml"
361343
}
362344
}
363345
}
364346
stage("EE") {
365347
environment {
366348
DCOS_DIR = "/tmp/.dcos-EE-1.13"
367349
PROXY_PORT = "4501"
368-
JUNIT_NAME = "ee-1.13"
369350
TERRAFORM_DIR = "./scripts/terraform-ee-1.13"
370351
TF_VAR_cluster_name = "ui-113ee-${cluster_suffix}-${BUILD_NUMBER}"
371352
TF_VAR_custom_dcos_download_path = "https://downloads.mesosphere.com/dcos-enterprise/stable/1.13.7/dcos_generate_config.ee.sh"
@@ -394,7 +375,6 @@ pipeline {
394375
sh "cd $TERRAFORM_DIR && ./down.sh"
395376
}
396377
archiveArtifacts "cypress/**/*"
397-
junit "cypress/result-${JUNIT_NAME}.xml"
398378
}
399379
}
400380
}

‎cypress.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
{
22
"chromeWebSecurity": false,
3-
"defaultCommandTimeout": 120000,
3+
"defaultCommandTimeout": 60000,
44
"env": {
55
"CLUSTER_URL": "http://localhost:4200"
66
},
77
"fixturesFolder": "tests/_fixtures",
88
"integrationFolder": "tests",
99
"pageLoadTimeout": 600000,
1010
"projectId": "a209b1cd-e44f-47a4-b22c-d8f26649f43f",
11-
"reporter": "junit",
12-
"retries": 3,
11+
"reporter": "spec",
1312
"screenshotsFolder": "cypress/screenshots",
1413
"supportFile": "tests/_support",
1514
"trashAssetsBeforeRuns": false,

‎locale/en/messages.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"<0>Retry now</0>": "",
2121
"<0>See documentation</0>.": "",
2222
"<0>This package is not tested for production environments and technical support is not provided.</0><1>Would you like to proceed?</1>": "",
23+
"A CSI-backed volume that is mounted on the agent from network attached storage.": "",
2324
"A REX-Ray backed volume that is mounted on the agent from network attached storage.": "",
2425
"A command to be run on the host or in the container.": "",
2526
"A description of this job.": "",
@@ -32,6 +33,7 @@
3233
"A shell command for your container to execute.": "",
3334
"A string or regex value.": "",
3435
"A string, integer or regex value.": "",
36+
"A unique identifier for the volume": "",
3537
"Access denied": "",
3638
"Actions": "",
3739
"Actions (<0>Allow All</0>)": "",
@@ -66,6 +68,7 @@
6668
"Add User to Group": "",
6769
"Add Volume": "",
6870
"Add a Permission for {0}": "",
71+
"Add entry": "",
6972
"Add to Group": "",
7073
"Add {title} Identity Provider": "",
7174
"Adding another container will automatically put multiple containers into a Pod definition. Your containers will be co-located on the same node and scale together. <0>More information</0>.": "",
@@ -441,6 +444,7 @@
441444
"Extended Runtime Priv.": "",
442445
"External": "",
443446
"External LDAP Configuration": "",
447+
"External Persistent CSI Volume": "",
444448
"External Persistent Volume": "",
445449
"Extract": "",
446450
"FALSE": "",
@@ -768,6 +772,8 @@
768772
"No virtual networks detected": "",
769773
"Node": "",
770774
"Node Capacity": "",
775+
"Node Publish Secret": "",
776+
"Node Stage Secret": "",
771777
"Nodes": "",
772778
"Non-Leaders": "",
773779
"None": "",
@@ -1088,6 +1094,7 @@
10881094
"The maximum amount of time allowed for tasks to gracefully terminate.": "",
10891095
"The maximum file size for a secret is 786KB.": "",
10901096
"The memory offered": "",
1097+
"The name of the CSI plugin": "",
10911098
"The network type will be shared across all your containers.": "",
10921099
"The number of CPU shares this job needs per instance. This number does not have to be integer, but can be a fraction.": "",
10931100
"The number of GPU shares this job needs per instance. Only available with the UCR runtime.": "",
@@ -1241,6 +1248,7 @@
12411248
"Virtual Network: {0}": "",
12421249
"Volume": "",
12431250
"Volume '{volumeId}' was not found.": "",
1251+
"Volume Context": "",
12441252
"Volume Name": "",
12451253
"Volume Profile": "",
12461254
"Volume Type": "",

‎locale/zh/messages.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"<0>Retry now</0>": "<0>立即重试</0>",
2121
"<0>See documentation</0>.": "<0>查看文档</0>.",
2222
"<0>This package is not tested for production environments and technical support is not provided.</0><1>Would you like to proceed?</1>": "<0>此包未针对生产环境进行测试，且未提供技术支持。</0><1>是否要继续？</1>",
23+
"A CSI-backed volume that is mounted on the agent from network attached storage.": "",
2324
"A REX-Ray backed volume that is mounted on the agent from network attached storage.": "从网络连接存储安装到代理上的 REX-Ray 备份卷。",
2425
"A command to be run on the host or in the container.": "要在主机或容器中运行的命令。",
2526
"A description of this job.": "此作业的描述。",
@@ -32,6 +33,7 @@
3233
"A shell command for your container to execute.": "容器要执行的 shell 命令。",
3334
"A string or regex value.": "字符串或 regex 值。",
3435
"A string, integer or regex value.": "字符串，整数或 regex 值。",
36+
"A unique identifier for the volume": "",
3537
"Access denied": "访问被拒绝",
3638
"Actions": "操作",
3739
"Actions (<0>Allow All</0>)": "操作（<0>允许全部</0>)",
@@ -66,6 +68,7 @@
6668
"Add User to Group": "将用户添加到组",
6769
"Add Volume": "添加卷",
6870
"Add a Permission for {0}": "为 {0} 添加权限",
71+
"Add entry": "",
6972
"Add to Group": "添加到组",
7073
"Add {title} Identity Provider": "添加 {title} 身份提供商",
7174
"Adding another container will automatically put multiple containers into a Pod definition. Your containers will be co-located on the same node and scale together. <0>More information</0>.": "添加另一个容器将自动使多个容器进入 Pod 定义。您的容器将共同位于同一节点上，并一起进行缩放。<0>更多信息</0>.",
@@ -441,6 +444,7 @@
441444
"Extended Runtime Priv.": "延长运行时权限",
442445
"External": "外部",
443446
"External LDAP Configuration": "外部 LDAP 配置",
447+
"External Persistent CSI Volume": "",
444448
"External Persistent Volume": "外部持久卷",
445449
"Extract": "提取",
446450
"FALSE": "错误",
@@ -768,6 +772,8 @@
768772
"No virtual networks detected": "未检测到虚拟网络",
769773
"Node": "节点",
770774
"Node Capacity": "节点容量",
775+
"Node Publish Secret": "",
776+
"Node Stage Secret": "",
771777
"Nodes": "节点",
772778
"Non-Leaders": "非簇头",
773779
"None": "非",
@@ -1088,6 +1094,7 @@
10881094
"The maximum amount of time allowed for tasks to gracefully terminate.": "从容终止任务所允许的最长时间。",
10891095
"The maximum file size for a secret is 786KB.": "",
10901096
"The memory offered": "已提供内存",
1097+
"The name of the CSI plugin": "",
10911098
"The network type will be shared across all your containers.": "网络类型将在所有容器中共享。",
10921099
"The number of CPU shares this job needs per instance. This number does not have to be integer, but can be a fraction.": "此作业每个实例所需的 CPU 共享次数。该数字不必为整数，可以是分数。",
10931100
"The number of GPU shares this job needs per instance. Only available with the UCR runtime.": "此作业每个实例所需的 GPU 共享次数。仅适用于 UCR 运行时。",
@@ -1241,6 +1248,7 @@
12411248
"Virtual Network: {0}": "虚拟网络：{0}",
12421249
"Volume": "卷",
12431250
"Volume '{volumeId}' was not found.": "未找到卷 '{volumeId}'。",
1251+
"Volume Context": "",
12441252
"Volume Name": "卷名称",
12451253
"Volume Profile": "卷配置文件",
12461254
"Volume Type": "卷类型",

0 commit comments

Comments
 (0)