Mark 'aggregate' as deprecated in concourse schema
See: https://www.pivotaltracker.com/story/show/166988686
This commit is contained in:
@@ -381,7 +381,7 @@ public class PipelineYmlSchema implements YamlSchema {
|
||||
|
||||
|
||||
YBeanUnionType step = f.yBeanUnion("Step", stepTypes);
|
||||
addProp(aggregateStep, "aggregate", f.yseq(step));
|
||||
addProp(aggregateStep, "aggregate", f.yseq(step)).isDeprecated("Deprecated in favor of `in_parallel`");
|
||||
YBeanType inParallelStepOptions = f.ybean("InParallelStepOptions");
|
||||
addProp(inParallelStepOptions, "steps", f.yseq(step));
|
||||
addProp(inParallelStepOptions, "limit", t_pos_integer);
|
||||
|
||||
@@ -305,9 +305,6 @@ public class ConcourseEditorTest {
|
||||
, // ==============
|
||||
"<*>"
|
||||
, // =>
|
||||
"aggregate:\n" +
|
||||
" - <*>"
|
||||
, // ==============
|
||||
"do:\n" +
|
||||
" - <*>"
|
||||
, // ==============
|
||||
@@ -322,6 +319,9 @@ public class ConcourseEditorTest {
|
||||
, // ==============
|
||||
"try:\n" +
|
||||
" <*>"
|
||||
, // ==============
|
||||
"aggregate:\n" +
|
||||
" - <*>"
|
||||
);
|
||||
}
|
||||
|
||||
@@ -4168,13 +4168,13 @@ public class ConcourseEditorTest {
|
||||
"→ timeout",
|
||||
"→ vars",
|
||||
//Completions with '-'
|
||||
"- aggregate",
|
||||
"- do",
|
||||
"- get",
|
||||
"- in_parallel",
|
||||
"- put",
|
||||
"- task",
|
||||
"- try",
|
||||
"- aggregate",
|
||||
//Dedented completions
|
||||
"← groups",
|
||||
"← resource_types",
|
||||
@@ -4363,7 +4363,7 @@ public class ConcourseEditorTest {
|
||||
"jobs:\n" +
|
||||
"- name: build-it\n" +
|
||||
" plan:\n" +
|
||||
" - aggregate:\n" +
|
||||
" - in_parallel:\n" +
|
||||
" # - put: version\n" +
|
||||
" - get: source-repo\n" +
|
||||
"- name: test-it\n" +
|
||||
@@ -4388,7 +4388,7 @@ public class ConcourseEditorTest {
|
||||
"jobs:\n" +
|
||||
"- name: build-it\n" +
|
||||
" plan:\n" +
|
||||
" - aggregate:\n" +
|
||||
" - in_parallel:\n" +
|
||||
" - put: version\n" +
|
||||
" # - get: source-repo\n" +
|
||||
"- name: test-it\n" +
|
||||
@@ -4414,7 +4414,7 @@ public class ConcourseEditorTest {
|
||||
"jobs:\n" +
|
||||
"- name: build-it\n" +
|
||||
" plan:\n" +
|
||||
" - aggregate:\n" +
|
||||
" - in_parallel:\n" +
|
||||
" - put: version\n" +
|
||||
" - get: source-repo\n" +
|
||||
"- name: test-it\n" +
|
||||
@@ -4477,7 +4477,10 @@ public class ConcourseEditorTest {
|
||||
" - build-it"
|
||||
);
|
||||
|
||||
editor.assertProblems("get: ^versi^|resource does not exist");
|
||||
editor.assertProblems(
|
||||
"aggregate|Deprecated",
|
||||
"get: ^versi^|resource does not exist"
|
||||
);
|
||||
}
|
||||
|
||||
@Test public void relaxedContentAssistContextForListItem_sameLine() throws Exception {
|
||||
@@ -4609,6 +4612,14 @@ public class ConcourseEditorTest {
|
||||
" plan:\n" +
|
||||
" in_"
|
||||
);
|
||||
editor.assertCompletionWithLabel("- in_parallel",
|
||||
"jobs:\n" +
|
||||
"- name: build-docker-image\n" +
|
||||
" serial: true\n" +
|
||||
" plan:\n" +
|
||||
" - in_parallel:\n" +
|
||||
" <*>"
|
||||
);
|
||||
}
|
||||
|
||||
@Test public void relaxedContentAssist_primary_properties() throws Exception{
|
||||
@@ -4716,7 +4727,7 @@ public class ConcourseEditorTest {
|
||||
"jobs:\n" +
|
||||
"- name: build-it\n" +
|
||||
" plan:\n" +
|
||||
" - aggregate:\n" +
|
||||
" - in_parallel:\n" +
|
||||
" - get: not-used\n" + // <-- This isn't a real use but looks like one!
|
||||
" resource: version\n" +
|
||||
" - put: source-repo\n"
|
||||
|
||||
@@ -81,7 +81,7 @@ jobs:
|
||||
- task: build-vscode-extensions
|
||||
file: sts4/concourse/tasks/build-vscode-extensions.yml
|
||||
on_success:
|
||||
aggregate:
|
||||
in_parallel:
|
||||
- put: s3-manifest-yaml-vsix
|
||||
params:
|
||||
file: vsix-files/vscode-manifest-yaml-*.vsix
|
||||
@@ -98,7 +98,7 @@ jobs:
|
||||
Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed!
|
||||
- name: build-website
|
||||
plan:
|
||||
- aggregate:
|
||||
- in_parallel:
|
||||
- get: sts4
|
||||
- get: s3-manifest-yaml-vsix
|
||||
passed:
|
||||
|
||||
Reference in New Issue
Block a user