Skip to content

Commit

Permalink
Update CI tests with latest images and HTTPS for downloading Lua
Browse files Browse the repository at this point in the history
  • Loading branch information
neilcook committed Oct 17, 2024
1 parent ffab50e commit 94d99ee
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 22 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/test-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jobs:
test_all:
name: test_all
env:
DOCKER_COMPOSE_VERSION: 1.29.2
LUAROCKS: 2.2.2
ES_USERNAME: elastic
ES_PASSWORD: changeme
Expand All @@ -28,11 +27,11 @@ jobs:
# We're testing on three versions of Elastic: 7, 8 and the
# Amazon Fork - OpenSearch 2.0
elastic: [el7, el8, os2]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v4
with:
fetch-depth: 5
fetch-depth: 6
submodules: recursive
- name: Set dynamic env vars
run: echo "CAFILE=$GITHUB_WORKSPACE/docker/certs/ca/ca.crt" >> $GITHUB_ENV
Expand All @@ -41,10 +40,8 @@ jobs:
run: echo "CACERT_PATH=--cacert $GITHUB_WORKSPACE/docker/certs/ca/ca.crt" >> $GITHUB_ENV
- name: install dependencies
run: sudo apt-get -y update && sudo apt-get install wget openssl -y
- name: install docker-compose
run: curl -L https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-`uname -s`-`uname -m` > docker-compose && chmod +x docker-compose && sudo mv docker-compose /usr/local/bin
- name: run elasticsearch
run: cd docker && docker-compose -f create-certs.yml up && cp docker-compose.yml.${{ matrix.elastic }} docker-compose.yml && docker-compose up -d && cd ..
run: cd docker && docker compose -f create-certs.yml up && cp docker-compose.yml.${{ matrix.elastic }} docker-compose.yml && docker compose up -d && cd ..
- name: setup test environment
env:
LUA: ${{ matrix.lua }}
Expand Down
6 changes: 2 additions & 4 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.2'

services:
os01:
image: opensearchproject/opensearch:2.0.0
Expand Down Expand Up @@ -34,7 +32,7 @@ services:

es02:
container_name: es02
image: docker.elastic.co/elasticsearch/elasticsearch:8.2.2
image: docker.elastic.co/elasticsearch/elasticsearch:8.15.2
environment:
- node.name=es02
- ELASTIC_PASSWORD=$ELASTIC_PASSWORD
Expand Down Expand Up @@ -62,7 +60,7 @@ services:
retries: 5

wait_until_ready:
image: docker.elastic.co/elasticsearch/elasticsearch:8.2.2
image: docker.elastic.co/elasticsearch/elasticsearch:8.15.2
command: /usr/bin/true
depends_on: {"es02": {"condition": "service_healthy"}}

Expand Down
2 changes: 0 additions & 2 deletions docker/docker-compose.yml.el7
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.2'

services:
es01:
container_name: es01
Expand Down
4 changes: 1 addition & 3 deletions docker/docker-compose.yml.el8
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
version: '2.2'

services:
es02:
container_name: es02
image: docker.elastic.co/elasticsearch/elasticsearch:8.2.2
image: docker.elastic.co/elasticsearch/elasticsearch:8.15.2
environment:
- node.name=es02
- ELASTIC_PASSWORD=$ELASTIC_PASSWORD
Expand Down
4 changes: 1 addition & 3 deletions docker/docker-compose.yml.os2
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
version: '2.2'

services:
os01:
image: opensearchproject/opensearch:2.0.0
image: opensearchproject/opensearch:2
container_name: os01
environment:
- node.name=os01
Expand Down
6 changes: 3 additions & 3 deletions tests/gh_actions/setup_lua.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ if [ "$LUAJIT" == "yes" ]; then
else

if [ "$LUA" == "lua5.1" ]; then
curl http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz
curl https://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz
cd lua-5.1.5;
elif [ "$LUA" == "lua5.2" ]; then
curl http://www.lua.org/ftp/lua-5.2.4.tar.gz | tar xz
curl https://www.lua.org/ftp/lua-5.2.4.tar.gz | tar xz
cd lua-5.2.4;
elif [ "$LUA" == "lua5.3" ]; then
curl http://www.lua.org/ftp/lua-5.3.3.tar.gz | tar xz
curl https://www.lua.org/ftp/lua-5.3.3.tar.gz | tar xz
cd lua-5.3.3;
fi

Expand Down

0 comments on commit 94d99ee

Please sign in to comment.