Skip to content

Commit 3d5af70

Browse files
authored
Run CI against 1.0.0-rc1 docker images (opensearch-project#36)
Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>
1 parent c793b8d commit 3d5af70

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

.github/workflows/e2e-tests-workflow.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ env:
1111
AD_OPENSEARCH_DASHBOARDS_PLUGIN_NAME: anomalyDetectionDashboards
1212
OPENSEARCH_DOCKER_IMAGE: opensearchstaging/opensearch
1313
DASHBOARDS_DOCKER_IMAGE: opensearchstaging/opensearch-dashboards
14+
DOCKER_TAG: 1.0.0-rc1
1415
jobs:
1516
test-with-security:
1617
name: Run e2e tests with security
@@ -66,14 +67,14 @@ jobs:
6667
plugin_version=$(node -pe "require('./package.json').version")
6768
echo plugin version: $plugin_version
6869
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
7071
then
7172
## 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
7475
echo "COPY build/$AD_OPENSEARCH_DASHBOARDS_PLUGIN_NAME-$plugin_version.zip ." >> Dockerfile-AD-OpenSearch-Dashboards
7576
## 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
7778
echo "RUN bin/opensearch-dashboards-plugin install file:///usr/share/opensearch-dashboards/$AD_OPENSEARCH_DASHBOARDS_PLUGIN_NAME-$plugin_version.zip;" >> Dockerfile-AD-OpenSearch-Dashboards
7879
7980
## Create the tagged images
@@ -106,9 +107,9 @@ jobs:
106107
steps:
107108
- name: Pull and Run Docker
108109
run: |
109-
if docker pull $OPENSEARCH_DOCKER_IMAGE:latest
110+
if docker pull $OPENSEARCH_DOCKER_IMAGE:$DOCKER_TAG
110111
then
111-
echo "FROM $OPENSEARCH_DOCKER_IMAGE:latest" >> Dockerfile
112+
echo "FROM $OPENSEARCH_DOCKER_IMAGE:$DOCKER_TAG" >> Dockerfile
112113
## The OpenSearch rest test client uses http by default.
113114
## Need to disable the security plugin to call the rest api over http.
114115
## Also need to remove any remaining security settings specified in opensearch.yml

0 commit comments

Comments
 (0)