Skip to content

Test 8.0 + 3.0 #2375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
364dbe5
[DOCS] Bump current version to 8.0
jrodewig Dec 9, 2021
3138a9f
Merge remote-tracking branch 'upstream/master' into docs__8.0-bump
jrodewig Jan 4, 2022
57619d2
Merge remote-tracking branch 'upstream/master' into docs__8.0-bump
jrodewig Jan 18, 2022
2ce2f6a
Merge remote-tracking branch 'upstream/master' into docs__8.0-bump
jrodewig Jan 24, 2022
9c64382
Merge remote-tracking branch 'upstream/master' into docs__8.0-bump
jrodewig Jan 25, 2022
b6aa49a
Merge remote-tracking branch 'upstream/master' into docs__8.0-bump
jrodewig Jan 26, 2022
f34478a
Trigger Build
jrodewig Jan 26, 2022
e6c921d
trigger build
jrodewig Jan 26, 2022
dd5dc35
trigger build
jrodewig Jan 27, 2022
c0a5e2a
trigger build
jrodewig Jan 27, 2022
f71fa78
Merge remote-tracking branch 'upstream/master' into docs__8.0-bump
jrodewig Jan 28, 2022
15c1c13
Add config for ECE 3.0.0 and Ecctl 1.8.0
alpar-t Jan 31, 2022
29e45a7
Change syntax to yaml
alpar-t Feb 1, 2022
b912b78
Fix yaml \t
alpar-t Feb 1, 2022
1cd0c4b
Merge branch 'master' into add-ece-3-0-0-ecctl-1-8
gtback Feb 1, 2022
4df35d9
Add missing branch mapping to mapCloudEceToClientsTeam
gtback Feb 1, 2022
8cb874a
Merge remote-tracking branch 'upstream/master' into docs__8.0-bump
jrodewig Feb 1, 2022
2128815
fix merge conflict
jrodewig Feb 1, 2022
38daa8a
trigger build
jrodewig Feb 3, 2022
f78f50c
trigger build
jrodewig Feb 3, 2022
839a390
Merge remote-tracking branch 'upstream/master' into docs__8.0-bump
jrodewig Feb 4, 2022
04f319b
remove 6.8 from stacklive
jrodewig Feb 4, 2022
825c9c2
whitespace fix
jrodewig Feb 4, 2022
63389e3
update 7.17
jrodewig Feb 4, 2022
ebd58cb
Merge branch 'master' into add-ece-3-0-0-ecctl-1-8
gtback Feb 8, 2022
b847078
Merge remote-tracking branch 'origin/master' into add-ece-3-0-0-ecctl…
alpar-t Feb 9, 2022
05c5238
Merge remote-tracking branch 'alpar-t/add-ece-3-0-0-ecctl-1-8' into a…
alpar-t Feb 9, 2022
32074c0
Merge remote-tracking branch 'jrodewig/docs__8.0-bump' into test-8.0-3.0
gtback Feb 9, 2022
5384ddb
Merge remote-tracking branch 'alpar-t/add-ece-3-0-0-ecctl-1-8' into t…
gtback Feb 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,17 @@ contents_title: Elastic Stack and Product Documentation
# <key>: &<variable> <value>
# The keys don't really matter, but by convention the are the same as the variable.
variables:
stackcurrent: &stackcurrent 7.17
stacklive: &stacklive [ master, 8.1, 8.0, 7.17, 6.8 ]
stackcurrent: &stackcurrent 8.0
stacklive: &stacklive [ master, 8.1, 8.0, 7.17 ]

stacklivemain: &stacklivemain [ main, 8.1, 8.0, 7.17, 6.8 ]
stacklivemain: &stacklivemain [ main, 8.1, 8.0, 7.17 ]

cloudSaasCurrent: &cloudSaasCurrent ms-69

mapCloudSaasToClientsTeam: &mapCloudSaasToClientsTeam
*cloudSaasCurrent : master
mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam
ms-69: master
ms-65: master
ms-62: master
ms-59: master
Expand Down Expand Up @@ -846,8 +847,25 @@ contents:
prefix: en/cloud-enterprise
tags: CloudEnterprise/Reference
subject: ECE
current: ms-65
branches: [ {'ms-65': 2.13}, {'ms-62': 2.12}, {'ms-59': 2.11}, {'ms-57': 2.10}, {'ms-53': 2.9}, {'ms-49': 2.8}, {'ms-47': 2.7}, {'release-ms-41': 2.6}, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.1, 1.0 ]
current: ms-69
branches:
- ms-69: 3.0
- ms-65: 2.13
- ms-62: 2.12
- ms-59: 2.11
- ms-57: 2.10
- ms-53: 2.9
- ms-49: 2.8
- ms-47: 2.7
- release-ms-41: 2.6
- 2.5
- 2.4
- 2.3
- 2.2
- 2.1
- 2.0
- 1.1
- 1.0
index: docs/cloud-enterprise/index.asciidoc
chunk: 2
private: 1
Expand All @@ -864,6 +882,7 @@ contents:
repo: cloud-assets
path: docs
map_branches:
ms-69: master
ms-65: master
ms-62: master
ms-59: master
Expand Down Expand Up @@ -938,8 +957,8 @@ contents:
prefix: en/ecctl
tags: CloudControl/Reference
subject: ECCTL
current: 1.7
branches: [ master, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ]
current: 1.8
branches: [ master, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ]
index: docs/index.asciidoc
chunk: 1
sources:
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/7.17.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ release-state can be: released | prerelease | unreleased
//////////
is-current-version can be: true | false
//////////
:is-current-version: true
:is-current-version: false

//////////
hide-xpack-tags defaults to "false" (they are shown unless set to "true")
Expand Down
4 changes: 2 additions & 2 deletions shared/versions/stack/8.0.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ bare_version never includes -alpha or -beta
//////////
release-state can be: released | prerelease | unreleased
//////////
:release-state: prerelease
:release-state: released

//////////
is-current-version can be: true | false
//////////
:is-current-version: false
:is-current-version: true

//////////
hide-xpack-tags defaults to "false" (they are shown unless set to "true")
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/current.asciidoc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include::7.17.asciidoc[]
include::8.0.asciidoc[]