Merge pull request #1836 from blackflux/dev

[Gally]: master <- dev
blackflux · Aug 1, 2024 · 5034b98 · 5034b98
2 parents c710749 + 28c41c1
commit 5034b98
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/plugin/tasks/circleci/snippets/run-yarn-tests-os.yml b/src/plugin/tasks/circleci/snippets/run-yarn-tests-os.yml
@@ -9,10 +9,10 @@ jobs:
       - image: '${dockerImage}'
         environment:
           opensearchEndpoint: localhost:9200
-      - image: opensearchproject/opensearch:2.9.0
+      - image: opensearchproject/opensearch:2.13.0
         environment:
           - discovery.type=single-node
-          - plugins.security.disabled=true
+          - DISABLE_SECURITY_PLUGIN=true
     <<<:
       - steps:
           - run:

diff --git a/src/plugin/tasks/docker/snippets/os/manage.sh b/src/plugin/tasks/docker/snippets/os/manage.sh
@@ -13,8 +13,8 @@ done
 docker run \
   --name os1 \
   -e "discovery.type=single-node" \
-  -e "plugins.security.disabled=true" \
-  -d opensearchproject/opensearch:2.9.0
+  -e "DISABLE_SECURITY_PLUGIN=true" \
+  -d opensearchproject/opensearch:2.13.0
 
 docker build \
   --build-arg COMMAND="$command" \

diff --git a/test/projects/assorted/@npm-opensource-os/.circleci/config.yml b/test/projects/assorted/@npm-opensource-os/.circleci/config.yml
@@ -92,10 +92,10 @@ jobs:
       - image: cimg/node:18.19
         environment:
           opensearchEndpoint: localhost:9200
-      - image: opensearchproject/opensearch:2.9.0
+      - image: opensearchproject/opensearch:2.13.0
         environment:
           - discovery.type=single-node
-          - plugins.security.disabled=true
+          - DISABLE_SECURITY_PLUGIN=true
     steps:
       - run:
           command: >
@@ -136,10 +136,10 @@ jobs:
       - image: cimg/node:20.11
         environment:
           opensearchEndpoint: localhost:9200
-      - image: opensearchproject/opensearch:2.9.0
+      - image: opensearchproject/opensearch:2.13.0
         environment:
           - discovery.type=single-node
-          - plugins.security.disabled=true
+          - DISABLE_SECURITY_PLUGIN=true
     steps:
       - run:
           command: >
@@ -180,10 +180,10 @@ jobs:
       - image: cimg/node:21.6
         environment:
           opensearchEndpoint: localhost:9200
-      - image: opensearchproject/opensearch:2.9.0
+      - image: opensearchproject/opensearch:2.13.0
         environment:
           - discovery.type=single-node
-          - plugins.security.disabled=true
+          - DISABLE_SECURITY_PLUGIN=true
     steps:
       - run:
           command: >

diff --git a/test/projects/assorted/@npm-opensource-os/manage.sh b/test/projects/assorted/@npm-opensource-os/manage.sh
@@ -13,8 +13,8 @@ done
 docker run \
   --name os1 \
   -e "discovery.type=single-node" \
-  -e "plugins.security.disabled=true" \
-  -d opensearchproject/opensearch:2.9.0
+  -e "DISABLE_SECURITY_PLUGIN=true" \
+  -d opensearchproject/opensearch:2.13.0
 
 docker build \
   --build-arg COMMAND="$command" \