Skip to content
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.

Sign up for GitHub

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

Backport: unmute rolling upgrade watcher tests and #51664

Merged
merged 1 commit into from
Jan 30, 2020
Merged

Backport: unmute rolling upgrade watcher tests and #51664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions x-pack/qa/rolling-upgrade/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ for (Version bwcVersion : bwcVersions.wireCompatible) {
}

javaHome = BuildParams.runtimeJavaHome
setting 'logger.org.elasticsearch.xpack.watcher', 'DEBUG'
}
}

Expand Down
17 changes: 2 additions & 15 deletions x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/60_watcher.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
---
"CRUD watch APIs":

- skip:
reason: https://github.com/elastic/elasticsearch/issues/33185
version: "6.7.0 - "

# no need to put watch, exists already
- do:
watcher.get_watch:
id: "my_watch"
- match: { found : true}
- match: { _id: "my_watch" }


# execute watch
- do:
watcher.execute_watch:
Expand Down Expand Up @@ -48,36 +42,29 @@
watcher.deactivate_watch:
watch_id: "my_watch"
- match: { status.state.active : false }

- do:
watcher.get_watch:
id: "my_watch"
- match: { found : true}
- match: { _id: "my_watch" }
- match: { status.state.active: false }


# activate watch again, check with GET API as well
- do:
watcher.activate_watch:
watch_id: "my_watch"
- match: { status.state.active : true }

- do:
watcher.get_watch:
id: "my_watch"
- match: { found : true}
- match: { _id: "my_watch" }
- match: { status.state.active: true }


---
"Test watcher stats output":

- skip:
reason: https://github.com/elastic/elasticsearch/issues/33185
version: "6.7.0 - "

- do:
watcher.stats: {}
- match: { "manually_stopped": false }
Expand Down
15 changes: 2 additions & 13 deletions x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/60_watcher.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
---
"CRUD watch APIs":
- skip:
reason: https://github.com/elastic/elasticsearch/issues/33185
version: "6.7.0 - "

- do:
watcher.put_watch:
id: "my_watch"
Expand Down Expand Up @@ -31,7 +27,6 @@
- match: { found : true}
- match: { _id: "my_watch" }


# execute watch
- do:
watcher.execute_watch:
Expand Down Expand Up @@ -67,7 +62,7 @@
watcher.deactivate_watch:
watch_id: "my_watch"
- match: { status.state.active : false }

- do:
watcher.get_watch:
id: "my_watch"
Expand All @@ -81,22 +76,16 @@
watcher.activate_watch:
watch_id: "my_watch"
- match: { status.state.active : true }

- do:
watcher.get_watch:
id: "my_watch"
- match: { found : true}
- match: { _id: "my_watch" }
- match: { status.state.active: true }


---
"Test watcher stats output":

- skip:
reason: https://github.com/elastic/elasticsearch/issues/33185
version: "6.7.0 - "

- do:
watcher.stats: {}
- match: { "manually_stopped": false }
Expand Down
15 changes: 2 additions & 13 deletions .../qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/60_watcher.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
---
"CRUD watch APIs":

- skip:
reason: https://github.com/elastic/elasticsearch/issues/33185
version: "6.7.0 - "

# no need to put watch, exists already
- do:
watcher.get_watch:
id: "my_watch"
- match: { found : true}
- match: { _id: "my_watch" }


# execute watch
- do:
watcher.execute_watch:
Expand Down Expand Up @@ -48,7 +42,7 @@
watcher.deactivate_watch:
watch_id: "my_watch"
- match: { status.state.active : false }

- do:
watcher.get_watch:
id: "my_watch"
Expand All @@ -62,7 +56,7 @@
watcher.activate_watch:
watch_id: "my_watch"
- match: { status.state.active : true }

- do:
watcher.get_watch:
id: "my_watch"
Expand All @@ -72,11 +66,6 @@

---
"Test watcher stats output":

- skip:
reason: https://github.com/elastic/elasticsearch/issues/33185
version: "6.7.0 - "

- do:
watcher.stats: {}
- match: { "manually_stopped": false }
Expand Down