From 493d5ae98dfd895ed33e1e5db5bd514ec9a97038 Mon Sep 17 00:00:00 2001 From: Ruirui Zhang Date: Tue, 29 Oct 2024 16:09:47 -0700 Subject: [PATCH 1/4] add wlm querygroup api specs Signed-off-by: Ruirui Zhang --- .github/workflows/test-spec.yml | 2 + spec/namespaces/wlm.yaml | 127 ++++++++++++++++++ spec/schemas/wlm._common.yaml | 98 ++++++++++++++ tests/plugins/wlm/Dockerfile | 6 + tests/plugins/wlm/docker-compose.yml | 17 +++ .../plugins/wlm/query_group/query_group.yaml | 67 +++++++++ 6 files changed, 317 insertions(+) create mode 100644 spec/namespaces/wlm.yaml create mode 100644 spec/schemas/wlm._common.yaml create mode 100644 tests/plugins/wlm/Dockerfile create mode 100644 tests/plugins/wlm/docker-compose.yml create mode 100644 tests/plugins/wlm/query_group/query_group.yaml diff --git a/.github/workflows/test-spec.yml b/.github/workflows/test-spec.yml index 23f0fffc6..a2d939161 100644 --- a/.github/workflows/test-spec.yml +++ b/.github/workflows/test-spec.yml @@ -42,6 +42,8 @@ jobs: tests: plugins/notifications - version: 2.17.0 tests: plugins/query_insights + - version: 2.17.0 + tests: plugins/wlm - version: 2.18.0 hub: opensearchstaging ref: '@sha256:57a1cd1142d68c203e2e4aa0666d9a691e1e409a5d14aa4a8f5044036f05cf06' diff --git a/spec/namespaces/wlm.yaml b/spec/namespaces/wlm.yaml new file mode 100644 index 000000000..300a59c28 --- /dev/null +++ b/spec/namespaces/wlm.yaml @@ -0,0 +1,127 @@ +openapi: 3.1.0 +info: + title: OpenSearch Workload Management API + description: OpenSearch Workload Management API + version: 1.0.0 +paths: + /_wlm/query_group: + get: + operationId: query_group.get.0 + x-operation-group: query_group.get + x-version-added: '2.17' + description: Gets the specified QueryGroup or get all if no name is provided. + responses: + '200': + $ref: '#/components/responses/query_group.get@200' + put: + operationId: query_group.create.0 + x-operation-group: query_group.create + x-version-added: '2.17' + description: Creates a specified query group. + requestBody: + $ref: '#/components/requestBodies/query_group.create' + responses: + '200': + $ref: '#/components/responses/query_group.create@200' + /_wlm/query_group/{name}: + get: + operationId: query_group.get.1 + x-operation-group: query_group.get + x-version-added: '2.17' + description: Gets the specified QueryGroup or get all if no name is provided. + parameters: + - $ref: '#/components/parameters/query_group.get::path.name' + responses: + '200': + $ref: '#/components/responses/query_group.get@200' + put: + operationId: query_group.update.0 + x-operation-group: query_group.update + x-version-added: '2.17' + description: Updates a specified query group. + parameters: + - $ref: '#/components/parameters/query_group.update::path.name' + requestBody: + $ref: '#/components/requestBodies/query_group.update' + responses: + '200': + $ref: '#/components/responses/query_group.update@200' + delete: + operationId: query_group.delete.1 + x-operation-group: query_group.delete + x-version-added: '2.17' + description: Deletes the specified QueryGroups or delete all if no name is provided. + parameters: + - $ref: '#/components/parameters/query_group.delete::path.name' + responses: + '200': + $ref: '#/components/responses/query_group.delete@200' +components: + requestBodies: + query_group.create: + content: + application/json: + schema: + $ref: '../schemas/wlm._common.yaml#/components/schemas/QueryGroupCreate' + required: true + query_group.update: + content: + application/json: + schema: + $ref: '../schemas/wlm._common.yaml#/components/schemas/QueryGroupUpdate' + required: true + responses: + query_group.create@200: + description: '' + content: + application/json: + schema: + $ref: '../schemas/wlm._common.yaml#/components/schemas/QueryGroupResponse' + query_group.update@200: + description: '' + content: + application/json: + schema: + $ref: '../schemas/wlm._common.yaml#/components/schemas/QueryGroupResponse' + query_group.delete@200: + description: '' + content: + application/json: + schema: + type: object + properties: + acknowledged: + type: boolean + query_group.get@200: + description: '' + content: + application/json: + schema: + type: object + properties: + query_groups: + type: array + items: + $ref: '../schemas/wlm._common.yaml#/components/schemas/QueryGroupResponse' + parameters: + query_group.update::path.name: + name: name + in: path + description: QueryGroup name. + schema: + type: string + required: true + query_group.delete::path.name: + name: name + in: path + description: QueryGroup name. + schema: + type: string + required: true + query_group.get::path.name: + name: name + in: path + description: QueryGroup name. + schema: + type: string + required: true diff --git a/spec/schemas/wlm._common.yaml b/spec/schemas/wlm._common.yaml new file mode 100644 index 000000000..7dff2eb59 --- /dev/null +++ b/spec/schemas/wlm._common.yaml @@ -0,0 +1,98 @@ +openapi: 3.1.0 +info: + title: Schemas of wlm._common category + description: Schemas of wlm._common category + version: 1.0.0 +paths: {} +components: + schemas: + QueryGroupResponse: + type: object + properties: + _id: + type: string + name: + type: string + resiliency_mode: + type: string + enum: [ "soft", "enforced", "monitor" ] + updated_at: + type: integer + format: int64 + resource_limits: + anyOf: + - type: object + properties: + memory: + type: number + format: double + cpu: + type: number + format: double + required: + - memory + - type: object + properties: + memory: + type: number + format: double + cpu: + type: number + format: double + required: + - cpu + required: + - _id + - name + - resiliency_mode + - updated_at + - resource_limits + QueryGroupCreate: + type: object + properties: + name: + type: string + resiliency_mode: + type: string + enum: [ "soft", "enforced", "monitor" ] + resource_limits: + anyOf: + - type: object + properties: + memory: + type: number + format: double + cpu: + type: number + format: double + required: + - memory + - type: object + properties: + memory: + type: number + format: double + cpu: + type: number + format: double + required: + - cpu + required: + - name + - resiliency_mode + - resource_limits + QueryGroupUpdate: + type: object + properties: + resiliency_mode: + type: string + enum: [ "soft", "enforced", "monitor" ] + resource_limits: + type: object + properties: + memory: + type: number + format: double + cpu: + type: number + format: double diff --git a/tests/plugins/wlm/Dockerfile b/tests/plugins/wlm/Dockerfile new file mode 100644 index 000000000..2d040ccb8 --- /dev/null +++ b/tests/plugins/wlm/Dockerfile @@ -0,0 +1,6 @@ +ARG OPENSEARCH_DOCKER_HUB_PROJECT +ARG OPENSEARCH_VERSION +ARG OPENSEARCH_DOCKER_REF + +FROM ${OPENSEARCH_DOCKER_HUB_PROJECT}/opensearch:${OPENSEARCH_VERSION}${OPENSEARCH_DOCKER_REF} +RUN ./bin/opensearch-plugin install -b workload-management diff --git a/tests/plugins/wlm/docker-compose.yml b/tests/plugins/wlm/docker-compose.yml new file mode 100644 index 000000000..c334c477f --- /dev/null +++ b/tests/plugins/wlm/docker-compose.yml @@ -0,0 +1,17 @@ +version: '3' + +services: + opensearch-cluster: + build: + context: . + args: + - OPENSEARCH_DOCKER_HUB_PROJECT=${OPENSEARCH_DOCKER_HUB_PROJECT:-opensearchproject} + - OPENSEARCH_DOCKER_REF=${OPENSEARCH_DOCKER_REF} + - OPENSEARCH_VERSION=2.17.0 + ports: + - 9200:9200 + - 9600:9600 + environment: + - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_PASSWORD:-myStrongPassword123!} + - OPENSEARCH_JAVA_OPTS=${OPENSEARCH_JAVA_OPTS} + - discovery.type=single-node diff --git a/tests/plugins/wlm/query_group/query_group.yaml b/tests/plugins/wlm/query_group/query_group.yaml new file mode 100644 index 000000000..dc69de13e --- /dev/null +++ b/tests/plugins/wlm/query_group/query_group.yaml @@ -0,0 +1,67 @@ +$schema: ../../../../json_schemas/test_story.schema.yaml + +description: This story tests all endpoints relevant to QueryGroups, from creation to deletion. + +prologues: + - path: /_wlm/query_group + version: '>= 2.17' + method: PUT + request: + payload: + name: analytics + resource_limits: + memory: 0.1 + resiliency_mode: monitor + status: [200] + - path: /_wlm/query_group + version: '>= 2.17' + method: PUT + request: + payload: + name: analytics2 + resource_limits: + memory: 0.15 + cpu: 0.05 + resiliency_mode: monitor + status: [200] + +chapters: + - synopsis: Update the QueryGroup named `analytics2`, with resiliency_mode to be enforced and memory to be 0.25 and cpu to be 0.25. + version: '>= 2.17' + path: /_wlm/query_group/{name} + method: PUT + parameters: + name: analytics2 + request: + payload: + resource_limits: + memory: 0.25 + cpu: 0.25 + resiliency_mode: enforced + response: + status: 200 + - synopsis: Get the QueryGroup named `analytics2`. + version: '>= 2.17' + path: /_wlm/query_group/{name} + method: GET + parameters: + name: analytics2 + response: + status: 200 + payload: + query_groups: + - name: analytics2 + resource_limits: + memory: 0.25 + cpu: 0.25 + resiliency_mode: enforced + +epilogues: + - path: /_wlm/query_group/analytics + version: '>= 2.17' + method: DELETE + status: [200] + - path: /_wlm/query_group/analytics2 + version: '>= 2.17' + method: DELETE + status: [200] From 37729e4fd42acc3bd6fc643cbfb00c7d8965cc30 Mon Sep 17 00:00:00 2001 From: Ruirui Zhang Date: Tue, 29 Oct 2024 16:33:05 -0700 Subject: [PATCH 2/4] fix issues Signed-off-by: Ruirui Zhang --- CHANGELOG.md | 1 + .../namespaces/{wlm.yaml => query_group.yaml} | 14 +++++----- ...._common.yaml => query_group._common.yaml} | 26 ++++++++++--------- .../plugins/wlm/query_group/query_group.yaml | 10 +++---- 4 files changed, 27 insertions(+), 24 deletions(-) rename spec/namespaces/{wlm.yaml => query_group.yaml} (84%) rename spec/schemas/{wlm._common.yaml => query_group._common.yaml} (84%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 323fa2686..52a61fab2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -106,6 +106,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Added `config_id` and `config_id_list` to `/_plugins/_notifications/configs` query parameters ([#594](https://github.com/opensearch-project/opensearch-api-specification/pull/594)) - Added a release workflow triggered on a tag ([#635](https://github.com/opensearch-project/opensearch-api-specification/pull/635)) - Added API spec for query insights plugin ([#625](https://github.com/opensearch-project/opensearch-api-specification/pull/625)) +- Added API specs for query groups lifecycle APIs ([#649](https://github.com/opensearch-project/opensearch-api-specification/pull/649)) - Added API spec for `adjust_pure_negative` for bool queries ([#641](https://github.com/opensearch-project/opensearch-api-specification/pull/641)) - Added a spec style checker [#620](https://github.com/opensearch-project/opensearch-api-specification/pull/620). - Added `remote_store` to node `Stats` ([#643](https://github.com/opensearch-project/opensearch-api-specification/pull/643)) diff --git a/spec/namespaces/wlm.yaml b/spec/namespaces/query_group.yaml similarity index 84% rename from spec/namespaces/wlm.yaml rename to spec/namespaces/query_group.yaml index 300a59c28..a55d47a33 100644 --- a/spec/namespaces/wlm.yaml +++ b/spec/namespaces/query_group.yaml @@ -1,7 +1,7 @@ openapi: 3.1.0 info: - title: OpenSearch Workload Management API - description: OpenSearch Workload Management API + title: OpenSearch Workload Management Query Group API + description: Query group lifecycle APIs for the workload management plugin. version: 1.0.0 paths: /_wlm/query_group: @@ -62,13 +62,13 @@ components: content: application/json: schema: - $ref: '../schemas/wlm._common.yaml#/components/schemas/QueryGroupCreate' + $ref: '../schemas/query_group._common.yaml#/components/schemas/QueryGroupCreate' required: true query_group.update: content: application/json: schema: - $ref: '../schemas/wlm._common.yaml#/components/schemas/QueryGroupUpdate' + $ref: '../schemas/query_group._common.yaml#/components/schemas/QueryGroupUpdate' required: true responses: query_group.create@200: @@ -76,13 +76,13 @@ components: content: application/json: schema: - $ref: '../schemas/wlm._common.yaml#/components/schemas/QueryGroupResponse' + $ref: '../schemas/query_group._common.yaml#/components/schemas/QueryGroupResponse' query_group.update@200: description: '' content: application/json: schema: - $ref: '../schemas/wlm._common.yaml#/components/schemas/QueryGroupResponse' + $ref: '../schemas/query_group._common.yaml#/components/schemas/QueryGroupResponse' query_group.delete@200: description: '' content: @@ -102,7 +102,7 @@ components: query_groups: type: array items: - $ref: '../schemas/wlm._common.yaml#/components/schemas/QueryGroupResponse' + $ref: '../schemas/query_group._common.yaml#/components/schemas/QueryGroupResponse' parameters: query_group.update::path.name: name: name diff --git a/spec/schemas/wlm._common.yaml b/spec/schemas/query_group._common.yaml similarity index 84% rename from spec/schemas/wlm._common.yaml rename to spec/schemas/query_group._common.yaml index 7dff2eb59..ca2c1ae7a 100644 --- a/spec/schemas/wlm._common.yaml +++ b/spec/schemas/query_group._common.yaml @@ -15,7 +15,7 @@ components: type: string resiliency_mode: type: string - enum: [ "soft", "enforced", "monitor" ] + enum: [enforced, monitor,soft] updated_at: type: integer format: int64 @@ -45,8 +45,8 @@ components: - _id - name - resiliency_mode - - updated_at - resource_limits + - updated_at QueryGroupCreate: type: object properties: @@ -54,7 +54,7 @@ components: type: string resiliency_mode: type: string - enum: [ "soft", "enforced", "monitor" ] + enum: [enforced, monitor,soft] resource_limits: anyOf: - type: object @@ -86,13 +86,15 @@ components: properties: resiliency_mode: type: string - enum: [ "soft", "enforced", "monitor" ] + enum: [enforced, monitor,soft] resource_limits: - type: object - properties: - memory: - type: number - format: double - cpu: - type: number - format: double + $ref: '#/components/schemas/ResourceLimitsSchema' + ResourceLimitsSchema: + type: object + properties: + memory: + type: number + format: double + cpu: + type: number + format: double diff --git a/tests/plugins/wlm/query_group/query_group.yaml b/tests/plugins/wlm/query_group/query_group.yaml index dc69de13e..517f05fc7 100644 --- a/tests/plugins/wlm/query_group/query_group.yaml +++ b/tests/plugins/wlm/query_group/query_group.yaml @@ -50,11 +50,11 @@ chapters: status: 200 payload: query_groups: - - name: analytics2 - resource_limits: - memory: 0.25 - cpu: 0.25 - resiliency_mode: enforced + - name: analytics2 + resource_limits: + memory: 0.25 + cpu: 0.25 + resiliency_mode: enforced epilogues: - path: /_wlm/query_group/analytics From a67219bc739fa73b0e63407be6f20c8e896b3779 Mon Sep 17 00:00:00 2001 From: Ruirui Zhang Date: Wed, 30 Oct 2024 13:48:27 -0700 Subject: [PATCH 3/4] address comments Signed-off-by: Ruirui Zhang --- spec/namespaces/query_group.yaml | 127 ------------------ spec/namespaces/wlm.yaml | 127 ++++++++++++++++++ ...ry_group._common.yaml => wlm._common.yaml} | 0 .../wlm/{query_group => }/query_group.yaml | 2 +- 4 files changed, 128 insertions(+), 128 deletions(-) delete mode 100644 spec/namespaces/query_group.yaml create mode 100644 spec/namespaces/wlm.yaml rename spec/schemas/{query_group._common.yaml => wlm._common.yaml} (100%) rename tests/plugins/wlm/{query_group => }/query_group.yaml (96%) diff --git a/spec/namespaces/query_group.yaml b/spec/namespaces/query_group.yaml deleted file mode 100644 index a55d47a33..000000000 --- a/spec/namespaces/query_group.yaml +++ /dev/null @@ -1,127 +0,0 @@ -openapi: 3.1.0 -info: - title: OpenSearch Workload Management Query Group API - description: Query group lifecycle APIs for the workload management plugin. - version: 1.0.0 -paths: - /_wlm/query_group: - get: - operationId: query_group.get.0 - x-operation-group: query_group.get - x-version-added: '2.17' - description: Gets the specified QueryGroup or get all if no name is provided. - responses: - '200': - $ref: '#/components/responses/query_group.get@200' - put: - operationId: query_group.create.0 - x-operation-group: query_group.create - x-version-added: '2.17' - description: Creates a specified query group. - requestBody: - $ref: '#/components/requestBodies/query_group.create' - responses: - '200': - $ref: '#/components/responses/query_group.create@200' - /_wlm/query_group/{name}: - get: - operationId: query_group.get.1 - x-operation-group: query_group.get - x-version-added: '2.17' - description: Gets the specified QueryGroup or get all if no name is provided. - parameters: - - $ref: '#/components/parameters/query_group.get::path.name' - responses: - '200': - $ref: '#/components/responses/query_group.get@200' - put: - operationId: query_group.update.0 - x-operation-group: query_group.update - x-version-added: '2.17' - description: Updates a specified query group. - parameters: - - $ref: '#/components/parameters/query_group.update::path.name' - requestBody: - $ref: '#/components/requestBodies/query_group.update' - responses: - '200': - $ref: '#/components/responses/query_group.update@200' - delete: - operationId: query_group.delete.1 - x-operation-group: query_group.delete - x-version-added: '2.17' - description: Deletes the specified QueryGroups or delete all if no name is provided. - parameters: - - $ref: '#/components/parameters/query_group.delete::path.name' - responses: - '200': - $ref: '#/components/responses/query_group.delete@200' -components: - requestBodies: - query_group.create: - content: - application/json: - schema: - $ref: '../schemas/query_group._common.yaml#/components/schemas/QueryGroupCreate' - required: true - query_group.update: - content: - application/json: - schema: - $ref: '../schemas/query_group._common.yaml#/components/schemas/QueryGroupUpdate' - required: true - responses: - query_group.create@200: - description: '' - content: - application/json: - schema: - $ref: '../schemas/query_group._common.yaml#/components/schemas/QueryGroupResponse' - query_group.update@200: - description: '' - content: - application/json: - schema: - $ref: '../schemas/query_group._common.yaml#/components/schemas/QueryGroupResponse' - query_group.delete@200: - description: '' - content: - application/json: - schema: - type: object - properties: - acknowledged: - type: boolean - query_group.get@200: - description: '' - content: - application/json: - schema: - type: object - properties: - query_groups: - type: array - items: - $ref: '../schemas/query_group._common.yaml#/components/schemas/QueryGroupResponse' - parameters: - query_group.update::path.name: - name: name - in: path - description: QueryGroup name. - schema: - type: string - required: true - query_group.delete::path.name: - name: name - in: path - description: QueryGroup name. - schema: - type: string - required: true - query_group.get::path.name: - name: name - in: path - description: QueryGroup name. - schema: - type: string - required: true diff --git a/spec/namespaces/wlm.yaml b/spec/namespaces/wlm.yaml new file mode 100644 index 000000000..083f8ed9e --- /dev/null +++ b/spec/namespaces/wlm.yaml @@ -0,0 +1,127 @@ +openapi: 3.1.0 +info: + title: OpenSearch Workload Management Query Group API + description: Query group lifecycle APIs for the workload management plugin. + version: 1.0.0 +paths: + /_wlm/query_group: + get: + operationId: wlm.get_query_group.0 + x-operation-group: wlm.get_query_group + x-version-added: '2.17' + description: Gets the specified QueryGroup or get all if no name is provided. + responses: + '200': + $ref: '#/components/responses/wlm.get_query_group@200' + put: + operationId: wlm.create_query_group.0 + x-operation-group: wlm.create_query_group + x-version-added: '2.17' + description: Creates the specified query group. + requestBody: + $ref: '#/components/requestBodies/wlm.create_query_group' + responses: + '200': + $ref: '#/components/responses/wlm.create_query_group@200' + /_wlm/query_group/{name}: + get: + operationId: wlm.get_query_group.1 + x-operation-group: wlm.get_query_group + x-version-added: '2.17' + description: Gets the specified QueryGroup or get all if no name is provided. + parameters: + - $ref: '#/components/parameters/wlm.get_query_group::path.name' + responses: + '200': + $ref: '#/components/responses/wlm.get_query_group@200' + put: + operationId: wlm.update_query_group.0 + x-operation-group: wlm.update_query_group + x-version-added: '2.17' + description: Updates the specified query group. + parameters: + - $ref: '#/components/parameters/wlm.update_query_group::path.name' + requestBody: + $ref: '#/components/requestBodies/wlm.update_query_group' + responses: + '200': + $ref: '#/components/responses/wlm.update_query_group@200' + delete: + operationId: wlm.delete_query_group.0 + x-operation-group: wlm.delete_query_group + x-version-added: '2.17' + description: Deletes the specified QueryGroup. + parameters: + - $ref: '#/components/parameters/wlm.delete_query_group::path.name' + responses: + '200': + $ref: '#/components/responses/wlm.delete_query_group@200' +components: + requestBodies: + wlm.create_query_group: + content: + application/json: + schema: + $ref: '../schemas/wlm._common.yaml#/components/schemas/QueryGroupCreate' + required: true + wlm.update_query_group: + content: + application/json: + schema: + $ref: '../schemas/wlm._common.yaml#/components/schemas/QueryGroupUpdate' + required: true + responses: + wlm.create_query_group@200: + description: '' + content: + application/json: + schema: + $ref: '../schemas/wlm._common.yaml#/components/schemas/QueryGroupResponse' + wlm.update_query_group@200: + description: '' + content: + application/json: + schema: + $ref: '../schemas/wlm._common.yaml#/components/schemas/QueryGroupResponse' + wlm.delete_query_group@200: + description: '' + content: + application/json: + schema: + type: object + properties: + acknowledged: + type: boolean + wlm.get_query_group@200: + description: '' + content: + application/json: + schema: + type: object + properties: + query_groups: + type: array + items: + $ref: '../schemas/wlm._common.yaml#/components/schemas/QueryGroupResponse' + parameters: + wlm.update_query_group::path.name: + name: name + in: path + description: QueryGroup name. + schema: + type: string + required: true + wlm.delete_query_group::path.name: + name: name + in: path + description: QueryGroup name. + schema: + type: string + required: true + wlm.get_query_group::path.name: + name: name + in: path + description: QueryGroup name. + schema: + type: string + required: true diff --git a/spec/schemas/query_group._common.yaml b/spec/schemas/wlm._common.yaml similarity index 100% rename from spec/schemas/query_group._common.yaml rename to spec/schemas/wlm._common.yaml diff --git a/tests/plugins/wlm/query_group/query_group.yaml b/tests/plugins/wlm/query_group.yaml similarity index 96% rename from tests/plugins/wlm/query_group/query_group.yaml rename to tests/plugins/wlm/query_group.yaml index 517f05fc7..6f2b86367 100644 --- a/tests/plugins/wlm/query_group/query_group.yaml +++ b/tests/plugins/wlm/query_group.yaml @@ -1,4 +1,4 @@ -$schema: ../../../../json_schemas/test_story.schema.yaml +$schema: ../../../json_schemas/test_story.schema.yaml description: This story tests all endpoints relevant to QueryGroups, from creation to deletion. From dae9c9890d0c71e01aeb9c0672327b478f1437da Mon Sep 17 00:00:00 2001 From: Ruirui Zhang Date: Wed, 30 Oct 2024 14:14:08 -0700 Subject: [PATCH 4/4] change folder name Signed-off-by: Ruirui Zhang --- .github/workflows/test-spec.yml | 2 +- tests/plugins/{wlm => workload-management}/Dockerfile | 0 tests/plugins/{wlm => workload-management}/docker-compose.yml | 0 tests/plugins/{wlm => workload-management}/query_group.yaml | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename tests/plugins/{wlm => workload-management}/Dockerfile (100%) rename tests/plugins/{wlm => workload-management}/docker-compose.yml (100%) rename tests/plugins/{wlm => workload-management}/query_group.yaml (100%) diff --git a/.github/workflows/test-spec.yml b/.github/workflows/test-spec.yml index a2d939161..3729b66cb 100644 --- a/.github/workflows/test-spec.yml +++ b/.github/workflows/test-spec.yml @@ -43,7 +43,7 @@ jobs: - version: 2.17.0 tests: plugins/query_insights - version: 2.17.0 - tests: plugins/wlm + tests: plugins/workload-management - version: 2.18.0 hub: opensearchstaging ref: '@sha256:57a1cd1142d68c203e2e4aa0666d9a691e1e409a5d14aa4a8f5044036f05cf06' diff --git a/tests/plugins/wlm/Dockerfile b/tests/plugins/workload-management/Dockerfile similarity index 100% rename from tests/plugins/wlm/Dockerfile rename to tests/plugins/workload-management/Dockerfile diff --git a/tests/plugins/wlm/docker-compose.yml b/tests/plugins/workload-management/docker-compose.yml similarity index 100% rename from tests/plugins/wlm/docker-compose.yml rename to tests/plugins/workload-management/docker-compose.yml diff --git a/tests/plugins/wlm/query_group.yaml b/tests/plugins/workload-management/query_group.yaml similarity index 100% rename from tests/plugins/wlm/query_group.yaml rename to tests/plugins/workload-management/query_group.yaml