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

updated workflows and version to 3.0.0 #905

Merged
merged 5 commits into from
Oct 20, 2022
Merged

updated workflows and version to 3.0.0 #905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de61db8
updated workflows and version to 3.0.0
ps48 Jul 28, 2022
c753907
Merge branch 'main' into create_3.0
ps48 Sep 29, 2022
e743bb2
update bwc tests to 2.4.0
ps48 Oct 12, 2022
4295004
Merge branch 'opensearch-project:main' into create_3.0
ps48 Oct 14, 2022
5b7bc75
update http library upstream changes
ps48 Oct 20, 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
2 changes: 1 addition & 1 deletion .github/workflows/dashboards-observability-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on: [pull_request, push]
env:
PLUGIN_NAME: dashboards-observability
OPENSEARCH_VERSION: 'main'
OPENSEARCH_PLUGIN_VERSION: 2.2.0.0
OPENSEARCH_PLUGIN_VERSION: 3.0.0.0

jobs:

Expand Down
4 changes: 2 additions & 2 deletions dashboards-observability/opensearch_dashboards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "observabilityDashboards",
"version": "2.2.0.0",
"opensearchDashboardsVersion": "2.2.0",
"version": "3.0.0.0",
"opensearchDashboardsVersion": "3.0.0",
"server": true,
"ui": true,
"requiredPlugins": [
Expand Down
2 changes: 1 addition & 1 deletion dashboards-observability/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "observability-dashboards",
"version": "2.2.0.0",
"version": "3.0.0.0",
"main": "index.ts",
"license": "Apache-2.0",
"scripts": {
Expand Down
10 changes: 5 additions & 5 deletions opensearch-observability/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
buildscript {
ext {
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
opensearch_version = System.getProperty("opensearch.version", "2.2.0-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
version_tokens = opensearch_version.tokenize('-')
opensearch_build = version_tokens[0] + '.0'
Expand Down Expand Up @@ -308,16 +308,16 @@ testClusters.integTest {
setting 'path.repo', repo.absolutePath
}

String bwcVersion = "1.2.0-SNAPSHOT"
String bwcVersion = "2.4.0-SNAPSHOT"
String baseName = "obsBwcCluster"
String bwcFilePath = "src/test/resources/bwc/"
String remoteFileURL = "https://github.com/opensearch-project/observability/releases/download/1.2.0.0/opensearch-observability-1.2.0.0.zip"
String remoteFileURL = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.4.0/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-observability-2.4.0.0.zip"

2.times {i ->
testClusters {
"${baseName}$i" {
testDistribution = "ARCHIVE"
versions = ["1.2.0",opensearch_version]
versions = ["2.4.0",opensearch_version]
numberOfNodes = 3
plugin(provider(new Callable<RegularFile>(){
@Override
Expand All @@ -329,7 +329,7 @@ String remoteFileURL = "https://github.com/opensearch-project/observability/rele
if (!dir.exists()) {
dir.mkdirs()
}
File file = new File(dir, "opensearch-observability-1.2.0.0-SNAPSHOT.zip")
File file = new File(dir, "opensearch-observability-2.4.0.0-SNAPSHOT.zip")
if (!file.exists()) {
new URL(remoteFileURL).withInputStream{ ins -> file.withOutputStream{ it << ins }}
}
Expand Down
4 changes: 2 additions & 2 deletions opensearch-observability/src/test/kotlin/org/opensearch/observability/PluginRestTestCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package org.opensearch.observability

import com.google.gson.JsonObject
import org.apache.http.HttpHost
import org.apache.hc.core5.http.HttpHost
import org.junit.After
import org.junit.AfterClass
import org.junit.Before
Expand Down Expand Up @@ -60,7 +60,7 @@ abstract class PluginRestTestCase : OpenSearchRestTestCase() {
open fun wipeAllOpenSearchIndices() {
if (preserveOpenSearchIndicesAfterTest()) return
val response = client().performRequest(Request("GET", "/_cat/indices?format=json&expand_wildcards=all"))
val xContentType = XContentType.fromMediaType(response.entity.contentType.value)
val xContentType = XContentType.fromMediaType(response.entity.contentType)
xContentType.xContent().createParser(
NamedXContentRegistry.EMPTY, DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
response.entity.content
Expand Down