|
11 | 11 | AD_OPENSEARCH_DASHBOARDS_PLUGIN_NAME: anomalyDetectionDashboards
|
12 | 12 | OPENSEARCH_DOCKER_IMAGE: opensearchstaging/opensearch
|
13 | 13 | DASHBOARDS_DOCKER_IMAGE: opensearchstaging/opensearch-dashboards
|
| 14 | + DOCKER_TAG: 1.0.0-rc1 |
14 | 15 | jobs:
|
15 | 16 | test-with-security:
|
16 | 17 | name: Run e2e tests with security
|
@@ -66,14 +67,14 @@ jobs:
|
66 | 67 | plugin_version=$(node -pe "require('./package.json').version")
|
67 | 68 | echo plugin version: $plugin_version
|
68 | 69 | echo plugin name: $AD_OPENSEARCH_DASHBOARDS_PLUGIN_NAME
|
69 |
| - if docker pull $OPENSEARCH_DOCKER_IMAGE:latest |
| 70 | + if docker pull $OPENSEARCH_DOCKER_IMAGE:$DOCKER_TAG |
70 | 71 | then
|
71 | 72 | ## Populate the Dockerfiles
|
72 |
| - echo "FROM $OPENSEARCH_DOCKER_IMAGE:latest" >> Dockerfile-AD-OpenSearch |
73 |
| - echo "FROM $DASHBOARDS_DOCKER_IMAGE:latest" >> Dockerfile-AD-OpenSearch-Dashboards |
| 73 | + echo "FROM $OPENSEARCH_DOCKER_IMAGE:$DOCKER_TAG" >> Dockerfile-AD-OpenSearch |
| 74 | + echo "FROM $DASHBOARDS_DOCKER_IMAGE:$DOCKER_TAG" >> Dockerfile-AD-OpenSearch-Dashboards |
74 | 75 | echo "COPY build/$AD_OPENSEARCH_DASHBOARDS_PLUGIN_NAME-$plugin_version.zip ." >> Dockerfile-AD-OpenSearch-Dashboards
|
75 | 76 | ## Uninstall existing AD artifact and install new one
|
76 |
| - echo "RUN if [ -d /usr/share/opensearch-dashboards/plugins/$AD_OPENSEARCH_DASHBOARDS_PLUGIN_NAME ]; then /usr/share/opensearch-dashboards/bin/opensearch-dashboards-plugin remove $AD_OPENSEARCH_DASHBOARDS_PLUGIN_NAME; fi" >> Dockerfile-AD-OpenSearch-Dashboards |
| 77 | + echo "RUN if [ -d /usr/share/opensearch-dashboards/plugins/anomaly-detection-dashboards ]; then /usr/share/opensearch-dashboards/bin/opensearch-dashboards-plugin remove anomaly-detection-dashboards; fi" >> Dockerfile-AD-OpenSearch-Dashboards |
77 | 78 | echo "RUN bin/opensearch-dashboards-plugin install file:///usr/share/opensearch-dashboards/$AD_OPENSEARCH_DASHBOARDS_PLUGIN_NAME-$plugin_version.zip;" >> Dockerfile-AD-OpenSearch-Dashboards
|
78 | 79 |
|
79 | 80 | ## Create the tagged images
|
@@ -106,9 +107,9 @@ jobs:
|
106 | 107 | steps:
|
107 | 108 | - name: Pull and Run Docker
|
108 | 109 | run: |
|
109 |
| - if docker pull $OPENSEARCH_DOCKER_IMAGE:latest |
| 110 | + if docker pull $OPENSEARCH_DOCKER_IMAGE:$DOCKER_TAG |
110 | 111 | then
|
111 |
| - echo "FROM $OPENSEARCH_DOCKER_IMAGE:latest" >> Dockerfile |
| 112 | + echo "FROM $OPENSEARCH_DOCKER_IMAGE:$DOCKER_TAG" >> Dockerfile |
112 | 113 | ## The OpenSearch rest test client uses http by default.
|
113 | 114 | ## Need to disable the security plugin to call the rest api over http.
|
114 | 115 | ## Also need to remove any remaining security settings specified in opensearch.yml
|
|
0 commit comments