test: parameterise emqx image name in automated integration tests
This commit is contained in:
parent
42695a2f9a
commit
c6c9ba400e
|
@ -12,6 +12,7 @@ jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
outputs:
|
outputs:
|
||||||
|
imgname: ${{ steps.build_docker.outputs.imgname}}
|
||||||
version: ${{ steps.build_docker.outputs.version}}
|
version: ${{ steps.build_docker.outputs.version}}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
@ -20,10 +21,15 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
make docker
|
make docker
|
||||||
echo "::set-output name=version::$(./pkg-vsn.sh)"
|
echo "::set-output name=version::$(./pkg-vsn.sh)"
|
||||||
|
if [ -f EMQX_ENTERPRISE ]; then
|
||||||
|
echo "::set-output name=imgname::emqx-ee"
|
||||||
|
else
|
||||||
|
echo "::set-output name=imgname::emqx"
|
||||||
|
fi
|
||||||
- uses: actions/upload-artifact@v2
|
- uses: actions/upload-artifact@v2
|
||||||
with:
|
with:
|
||||||
name: emqx-docker-image-zip
|
name: emqx-docker-image-zip
|
||||||
path: _packages/emqx/emqx-docker-${{ steps.build_docker.outputs.version }}.zip
|
path: _packages/${{ steps.build_docker.outputs.imgname }}/${{ steps.build_docker.outputs.imgname }}-docker-${{ steps.build_docker.outputs.version }}.zip
|
||||||
|
|
||||||
webhook:
|
webhook:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
@ -43,14 +49,15 @@ jobs:
|
||||||
path: /tmp
|
path: /tmp
|
||||||
- name: load docker image
|
- name: load docker image
|
||||||
env:
|
env:
|
||||||
|
imgname: ${{ needs.build.outputs.imgname}}
|
||||||
version: ${{ needs.build.outputs.version }}
|
version: ${{ needs.build.outputs.version }}
|
||||||
run: |
|
run: |
|
||||||
unzip -q /tmp/emqx-docker-${version}.zip -d /tmp
|
unzip -q /tmp/${imgname}-docker-${version}.zip -d /tmp
|
||||||
docker load < /tmp/emqx-docker-${version}
|
docker load < /tmp/${imgname}-docker-${version}
|
||||||
- name: docker compose up
|
- name: docker compose up
|
||||||
timeout-minutes: 5
|
timeout-minutes: 5
|
||||||
env:
|
env:
|
||||||
TARGET: emqx/emqx
|
TARGET: emqx/${{ needs.build.outputs.imgname }}
|
||||||
EMQX_TAG: ${{ needs.build.outputs.version }}
|
EMQX_TAG: ${{ needs.build.outputs.version }}
|
||||||
run: |
|
run: |
|
||||||
docker-compose \
|
docker-compose \
|
||||||
|
@ -142,14 +149,15 @@ jobs:
|
||||||
path: /tmp
|
path: /tmp
|
||||||
- name: load docker image
|
- name: load docker image
|
||||||
env:
|
env:
|
||||||
|
imgname: ${{ needs.build.outputs.imgname }}
|
||||||
version: ${{ needs.build.outputs.version }}
|
version: ${{ needs.build.outputs.version }}
|
||||||
run: |
|
run: |
|
||||||
unzip -q /tmp/emqx-docker-${version}.zip -d /tmp
|
unzip -q /tmp/${imgname}-docker-${version}.zip -d /tmp
|
||||||
docker load < /tmp/emqx-docker-${version}
|
docker load < /tmp/${imgname}-docker-${version}
|
||||||
- name: docker compose up
|
- name: docker compose up
|
||||||
timeout-minutes: 5
|
timeout-minutes: 5
|
||||||
env:
|
env:
|
||||||
TARGET: emqx/emqx
|
TARGET: emqx/${{ needs.build.outputs.imgname }}
|
||||||
EMQX_TAG: ${{ needs.build.outputs.version }}
|
EMQX_TAG: ${{ needs.build.outputs.version }}
|
||||||
MYSQL_TAG: ${{ matrix.mysql_tag }}
|
MYSQL_TAG: ${{ matrix.mysql_tag }}
|
||||||
run: |
|
run: |
|
||||||
|
@ -248,14 +256,15 @@ jobs:
|
||||||
path: /tmp
|
path: /tmp
|
||||||
- name: load docker image
|
- name: load docker image
|
||||||
env:
|
env:
|
||||||
|
imgname: ${{ needs.build.outputs.imgname }}
|
||||||
version: ${{ needs.build.outputs.version }}
|
version: ${{ needs.build.outputs.version }}
|
||||||
run: |
|
run: |
|
||||||
unzip -q /tmp/emqx-docker-${version}.zip -d /tmp
|
unzip -q /tmp/${imgname}-docker-${version}.zip -d /tmp
|
||||||
docker load < /tmp/emqx-docker-${version}
|
docker load < /tmp/${imgname}-docker-${version}
|
||||||
- name: docker compose up
|
- name: docker compose up
|
||||||
timeout-minutes: 5
|
timeout-minutes: 5
|
||||||
env:
|
env:
|
||||||
TARGET: emqx/emqx
|
TARGET: emqx/${{ needs.build.outputs.imgname }}
|
||||||
EMQX_TAG: ${{ needs.build.outputs.version }}
|
EMQX_TAG: ${{ needs.build.outputs.version }}
|
||||||
PGSQL_TAG: ${{ matrix.pgsql_tag }}
|
PGSQL_TAG: ${{ matrix.pgsql_tag }}
|
||||||
run: |
|
run: |
|
||||||
|
@ -343,14 +352,15 @@ jobs:
|
||||||
path: /tmp
|
path: /tmp
|
||||||
- name: load docker image
|
- name: load docker image
|
||||||
env:
|
env:
|
||||||
|
imgname: ${{ needs.build.outputs.imgname }}
|
||||||
version: ${{ needs.build.outputs.version }}
|
version: ${{ needs.build.outputs.version }}
|
||||||
run: |
|
run: |
|
||||||
unzip -q /tmp/emqx-docker-${version}.zip -d /tmp
|
unzip -q /tmp/${imgname}-docker-${version}.zip -d /tmp
|
||||||
docker load < /tmp/emqx-docker-${version}
|
docker load < /tmp/${imgname}-docker-${version}
|
||||||
- name: docker compose up
|
- name: docker compose up
|
||||||
timeout-minutes: 5
|
timeout-minutes: 5
|
||||||
env:
|
env:
|
||||||
TARGET: emqx/emqx
|
TARGET: emqx/${{ needs.build.outputs.imgname }}
|
||||||
EMQX_TAG: ${{ needs.build.outputs.version }}
|
EMQX_TAG: ${{ needs.build.outputs.version }}
|
||||||
MYSQL_TAG: 8
|
MYSQL_TAG: 8
|
||||||
run: |
|
run: |
|
||||||
|
|
Loading…
Reference in New Issue