Skip to content

Commit 8e910d8

Browse files
reenable docker image tests (#288) (#292)
Signed-off-by: Xun Zhang <[email protected]> (cherry picked from commit d20d7cb) Co-authored-by: Xun Zhang <[email protected]>
1 parent 6307444 commit 8e910d8

File tree

1 file changed

+32
-33
lines changed

1 file changed

+32
-33
lines changed

.github/workflows/CI-workflow.yml

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,39 +35,38 @@ jobs:
3535
- name: Multi Nodes Integration Testing
3636
run: |
3737
./gradlew integTest -PnumNodes=3
38-
# ToDo: Check infra team for 2.0 docker availability and re-enable
39-
# - name: Pull and Run Docker
40-
# run: |
41-
# plugin=`basename $(ls plugin/build/distributions/*.zip)`
42-
# version=`echo $plugin|awk -F- '{print $3}'| cut -d. -f 1-3`
43-
# plugin_version=`echo $plugin|awk -F- '{print $3}'| cut -d. -f 1-4`
44-
# qualifier=`echo $plugin|awk -F- '{print $4}'| cut -d. -f 1-1`
45-
# candidate_version=`echo $plugin|awk -F- '{print $5}'| cut -d. -f 1-1`
46-
# docker_version=$version-$qualifier
47-
#
48-
# [[ -z $candidate_version ]] && candidate_version=$qualifier && qualifier=""
49-
#
50-
# echo plugin version plugin_version qualifier candidate_version docker_version
51-
# echo "($plugin) ($version) ($plugin_version) ($qualifier) ($candidate_version) ($docker_version)"
52-
#
53-
# cd ..
54-
# if docker pull opensearchstaging/opensearch:$docker_version
55-
# then
56-
# echo "FROM opensearchstaging/opensearch:$docker_version" >> Dockerfile
57-
# echo "RUN if [ -d /usr/share/opensearch/plugins/opensearch-ml ]; then /usr/share/opensearch/bin/opensearch-plugin remove opensearch-ml; fi" >> Dockerfile
58-
# echo "ADD ml-commons/plugin/build/distributions/$plugin /tmp/" >> Dockerfile
59-
# echo "RUN /usr/share/opensearch/bin/opensearch-plugin install --batch file:/tmp/$plugin" >> Dockerfile
60-
# docker build -t opensearch-ml:test .
61-
# echo "imagePresent=true" >> $GITHUB_ENV
62-
# else
63-
# echo "imagePresent=false" >> $GITHUB_ENV
64-
# fi
65-
# - name: Run Docker Image
66-
# if: env.imagePresent == 'true'
67-
# run: |
68-
# cd ..
69-
# docker run -p 9200:9200 -d -p 9600:9600 -e "discovery.type=single-node" opensearch-ml:test
70-
# sleep 90
38+
- name: Pull and Run Docker
39+
run: |
40+
plugin=`basename $(ls plugin/build/distributions/*.zip)`
41+
version=`echo $plugin|awk -F- '{print $3}'| cut -d. -f 1-3`
42+
plugin_version=`echo $plugin|awk -F- '{print $3}'| cut -d. -f 1-4`
43+
qualifier=`echo $plugin|awk -F- '{print $4}'| cut -d. -f 1-1`
44+
candidate_version=`echo $plugin|awk -F- '{print $5}'| cut -d. -f 1-1`
45+
docker_version=$version-$qualifier
46+
47+
[[ -z $candidate_version ]] && candidate_version=$qualifier && qualifier=""
48+
49+
echo plugin version plugin_version qualifier candidate_version docker_version
50+
echo "($plugin) ($version) ($plugin_version) ($qualifier) ($candidate_version) ($docker_version)"
51+
52+
cd ..
53+
if docker pull opensearchstaging/opensearch:$docker_version
54+
then
55+
echo "FROM opensearchstaging/opensearch:$docker_version" >> Dockerfile
56+
echo "RUN if [ -d /usr/share/opensearch/plugins/opensearch-ml ]; then /usr/share/opensearch/bin/opensearch-plugin remove opensearch-ml; fi" >> Dockerfile
57+
echo "ADD ml-commons/plugin/build/distributions/$plugin /tmp/" >> Dockerfile
58+
echo "RUN /usr/share/opensearch/bin/opensearch-plugin install --batch file:/tmp/$plugin" >> Dockerfile
59+
docker build -t opensearch-ml:test .
60+
echo "imagePresent=true" >> $GITHUB_ENV
61+
else
62+
echo "imagePresent=false" >> $GITHUB_ENV
63+
fi
64+
- name: Run Docker Image
65+
if: env.imagePresent == 'true'
66+
run: |
67+
cd ..
68+
docker run -p 9200:9200 -d -p 9600:9600 -e "discovery.type=single-node" opensearch-ml:test
69+
sleep 90
7170
- name: Run MLCommons Test
7271
if: env.imagePresent == 'true'
7372
run: |

0 commit comments

Comments
 (0)