yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: bump otp version to 24.1.5-3

This commit is contained in:
zhanghongtong 2021-12-10 09:58:36 +08:00
parent b4f9fe90be
commit baf8d7d91c
14 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/build_packages/Dockerfile
View File

@ -1,4 +1,4 @@
ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-2:23.3.4.9-3-ubuntu20.04 ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-4:24.1.5-3-ubuntu20.04
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
ARG EMQX_NAME=emqx ARG EMQX_NAME=emqx

2
.ci/docker-compose-file/docker-compose.yaml
View File

@ -3,7 +3,7 @@ version: '3.9'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: ghcr.io/emqx/emqx-builder/4.4-2:23.3.4.9-3-ubuntu20.04 image: ghcr.io/emqx/emqx-builder/4.4-4:24.1.5-3-ubuntu20.04
env_file: env_file:
- conf.env - conf.env
environment: environment:

4
.ci/fvt_tests/local_relup_test_run.sh
View File

@ -15,8 +15,8 @@ PROFILE="$1"
VSN="$2" VSN="$2"
OLD_VSN="$3" OLD_VSN="$3"
PACKAGE_PATH="$4" PACKAGE_PATH="$4"
FROM_OTP_VSN="${5:-23.3.4.9-3}" FROM_OTP_VSN="${5:-24.1.5-3}"
TO_OTP_VSN="${6:-23.3.4.9-3}" TO_OTP_VSN="${6:-24.1.5-3}"
TEMPDIR=$(mktemp -d) TEMPDIR=$(mktemp -d)
trap '{ rm -rf -- "$TEMPDIR"; }' EXIT trap '{ rm -rf -- "$TEMPDIR"; }' EXIT

23
.github/workflows/build_packages.yaml vendored
View File

@ -16,7 +16,7 @@ jobs:
prepare: prepare:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
# prepare source with any OTP version, no need for a matrix # prepare source with any OTP version, no need for a matrix
container: ghcr.io/emqx/emqx-builder/4.4-2:23.3.4.9-3-ubuntu20.04 container: ghcr.io/emqx/emqx-builder/4.4-4:24.1.5-3-ubuntu20.04
outputs: outputs:
profiles: ${{ steps.set_profile.outputs.profiles }} profiles: ${{ steps.set_profile.outputs.profiles }}
@ -141,7 +141,7 @@ jobs:
matrix: matrix:
profile: ${{fromJSON(needs.prepare.outputs.profiles)}} profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
erl_otp: erl_otp:
- 23.3.4.9-3 - 24.1.5-3
macos: macos:
- macos-11 - macos-11
- macos-10.15 - macos-10.15
@ -224,8 +224,12 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
profile: ${{fromJSON(needs.prepare.outputs.profiles)}} profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
package:
- zip
- pkg
otp: otp:
- 23.3.4.9-3 - 23.3.4.9-3
- 24.1.5-3
arch: arch:
- amd64 - amd64
- arm64 - arm64
@ -242,6 +246,8 @@ jobs:
- raspbian10 - raspbian10
# - raspbian9 # - raspbian9
exclude: exclude:
- package: pkg
otp: 23.3.4.9-3
- os: centos6 - os: centos6
arch: arm64 arch: arm64
- os: raspbian9 - os: raspbian9
@ -274,6 +280,7 @@ jobs:
- name: unzip source code - name: unzip source code
run: unzip -q source.zip run: unzip -q source.zip
- name: downloads old emqx zip packages - name: downloads old emqx zip packages
if: matrix.package == 'zip'
env: env:
OTP_VSN: ${{ matrix.otp }} OTP_VSN: ${{ matrix.otp }}
PROFILE: ${{ matrix.profile }} PROFILE: ${{ matrix.profile }}
@ -306,6 +313,7 @@ jobs:
env: env:
OTP: ${{ matrix.otp }} OTP: ${{ matrix.otp }}
PROFILE: ${{ matrix.profile }} PROFILE: ${{ matrix.profile }}
PACKAGE: ${{ matrix.package}}
ARCH: ${{ matrix.arch }} ARCH: ${{ matrix.arch }}
SYSTEM: ${{ matrix.os }} SYSTEM: ${{ matrix.os }}
working-directory: source working-directory: source
@ -314,9 +322,8 @@ jobs:
-v $(pwd):/emqx \ -v $(pwd):/emqx \
--workdir /emqx \ --workdir /emqx \
--platform linux/$ARCH \ --platform linux/$ARCH \
ghcr.io/emqx/emqx-builder/4.4-2:$OTP-$SYSTEM \ ghcr.io/emqx/emqx-builder/4.4-4:$OTP-$SYSTEM \
bash -euc "make $PROFILE-zip || cat rebar3.crashdump; \ bash -euc "make ${PROFILE}-${PACKAGE} || cat rebar3.crashdump; \
make $PROFILE-pkg || cat rebar3.crashdump; \
EMQX_NAME=$PROFILE && .ci/build_packages/tests.sh" EMQX_NAME=$PROFILE && .ci/build_packages/tests.sh"
- name: create sha256 - name: create sha256
working-directory: source working-directory: source
@ -345,7 +352,7 @@ jobs:
matrix: matrix:
profile: ${{fromJSON(needs.prepare.outputs.profiles)}} profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
otp: otp:
- 23.3.4.9-3 - 24.1.5-3
steps: steps:
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v2
@ -386,7 +393,7 @@ jobs:
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
build-args: | build-args: |
BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-2:${{ matrix.otp }}-alpine3.14 BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-4:${{ matrix.otp }}-alpine3.14
RUN_FROM=alpine:3.14 RUN_FROM=alpine:3.14
EMQX_NAME=${{ matrix.profile }} EMQX_NAME=${{ matrix.profile }}
file: source/deploy/docker/Dockerfile file: source/deploy/docker/Dockerfile
@ -425,7 +432,7 @@ jobs:
matrix: matrix:
profile: ${{fromJSON(needs.prepare.outputs.profiles)}} profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
otp: otp:
- 23.3.4.9-3 - 24.1.5-3
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

5
.github/workflows/build_slim_packages.yaml vendored
View File

@ -22,11 +22,12 @@ jobs:
matrix: matrix:
erl_otp: erl_otp:
- 23.3.4.9-3 - 23.3.4.9-3
- 24.1.5-3
os: os:
- ubuntu20.04 - ubuntu20.04
- centos7 - centos7
container: ghcr.io/emqx/emqx-builder/4.4-2:${{ matrix.erl_otp }}-${{ matrix.os }} container: ghcr.io/emqx/emqx-builder/4.4-4:${{ matrix.erl_otp }}-${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
@ -64,7 +65,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
erl_otp: erl_otp:
- 23.3.4.9-3 - 24.1.5-3
macos: macos:
- macos-11 - macos-11
- macos-10.15 - macos-10.15

2
.github/workflows/check_deps_integrity.yaml vendored
View File

@ -5,7 +5,7 @@ on: [pull_request]
jobs: jobs:
check_deps_integrity: check_deps_integrity:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-2:23.3.4.9-3-ubuntu20.04 container: ghcr.io/emqx/emqx-builder/4.4-4:24.1.5-3-ubuntu20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

2
.github/workflows/run_acl_migration_tests.yaml vendored
View File

@ -5,7 +5,7 @@ on: workflow_dispatch
jobs: jobs:
test: test:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-2:23.3.4.9-3-ubuntu20.04 container: ghcr.io/emqx/emqx-builder/4.4-4:24.1.5-3-ubuntu20.04
strategy: strategy:
fail-fast: true fail-fast: true
env: env:

2
.github/workflows/run_automate_tests.yaml vendored
View File

@ -33,7 +33,7 @@ jobs:
fi fi
- name: build docker image - name: build docker image
env: env:
OTP_VSN: 23.3.4.9-3 OTP_VSN: 24.1.5-3
run: | run: |
make ${{ steps.prepare.outputs.imgname }}-docker make ${{ steps.prepare.outputs.imgname }}-docker
docker save emqx/${{ steps.prepare.outputs.imgname }}:${{ steps.prepare.outputs.version }} -o image.tar.gz docker save emqx/${{ steps.prepare.outputs.imgname }}:${{ steps.prepare.outputs.version }} -o image.tar.gz

12
.github/workflows/run_fvt_tests.yaml vendored
View File

@ -31,7 +31,7 @@ jobs:
fi fi
- name: make emqx image - name: make emqx image
env: env:
OTP_VSN: 23.3.4.9-3 OTP_VSN: 24.1.5-3
run: make ${PROFILE}-docker run: make ${PROFILE}-docker
- name: run emqx - name: run emqx
timeout-minutes: 5 timeout-minutes: 5
@ -92,7 +92,7 @@ jobs:
fi fi
- name: make emqx image - name: make emqx image
env: env:
OTP_VSN: 23.3.4.9-3 OTP_VSN: 24.1.5-3
run: make ${PROFILE}-docker run: make ${PROFILE}-docker
- name: install k3s - name: install k3s
env: env:
@ -224,7 +224,7 @@ jobs:
relup_test_plan: relup_test_plan:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-2:23.3.4.9-3-ubuntu20.04 container: ghcr.io/emqx/emqx-builder/4.4-4:24.1.5-3-ubuntu20.04
outputs: outputs:
profile: ${{ steps.profile-and-versions.outputs.profile }} profile: ${{ steps.profile-and-versions.outputs.profile }}
vsn: ${{ steps.profile-and-versions.outputs.vsn }} vsn: ${{ steps.profile-and-versions.outputs.vsn }}
@ -273,7 +273,7 @@ jobs:
relup_test_build: relup_test_build:
needs: relup_test_plan needs: relup_test_plan
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-2:23.3.4.9-3-ubuntu20.04 container: ghcr.io/emqx/emqx-builder/4.4-4:24.1.5-3-ubuntu20.04
defaults: defaults:
run: run:
shell: bash shell: bash
@ -360,8 +360,8 @@ jobs:
--var ONE_MORE_EMQX_PATH=$(pwd)/one_more_emqx \ --var ONE_MORE_EMQX_PATH=$(pwd)/one_more_emqx \
--var VSN="$VSN" \ --var VSN="$VSN" \
--var OLD_VSN="$OLD_VSN" \ --var OLD_VSN="$OLD_VSN" \
--var FROM_OTP_VSN="23.3.4.9-3" \ --var FROM_OTP_VSN="24.1.5-3" \
--var TO_OTP_VSN="23.3.4.9-3" \ --var TO_OTP_VSN="24.1.5-3" \
emqx_built/.ci/fvt_tests/relup.lux emqx_built/.ci/fvt_tests/relup.lux
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
name: Save debug data name: Save debug data

4
.github/workflows/run_test_cases.yaml vendored
View File

@ -10,7 +10,7 @@ on:
jobs: jobs:
run_static_analysis: run_static_analysis:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-2:23.3.4.9-3-ubuntu20.04 container: ghcr.io/emqx/emqx-builder/4.4-4:24.1.5-3-ubuntu20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -27,7 +27,7 @@ jobs:
run_proper_test: run_proper_test:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-2:23.3.4.9-3-ubuntu20.04 container: ghcr.io/emqx/emqx-builder/4.4-4:24.1.5-3-ubuntu20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

2
.tool-versions
View File

@ -1 +1 @@
erlang 23.3.4.9-3 erlang 24.1.5-3

2
Makefile
View File

@ -3,7 +3,7 @@ REBAR_VERSION = 3.14.3-emqx-8
REBAR = $(CURDIR)/rebar3 REBAR = $(CURDIR)/rebar3
BUILD = $(CURDIR)/build BUILD = $(CURDIR)/build
SCRIPTS = $(CURDIR)/scripts SCRIPTS = $(CURDIR)/scripts
export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/4.4-2:23.3.4.9-3-alpine3.14 export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/4.4-4:24.1.5-3-alpine3.14
export EMQX_DEFAULT_RUNNER = alpine:3.14 export EMQX_DEFAULT_RUNNER = alpine:3.14
export OTP_VSN ?= $(shell $(CURDIR)/scripts/get-otp-vsn.sh) export OTP_VSN ?= $(shell $(CURDIR)/scripts/get-otp-vsn.sh)
export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh) export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)

2
build
View File

@ -150,7 +150,7 @@ make_docker() {
## Name Default Example ## Name Default Example
## --------------------------------------------------------------------- ## ---------------------------------------------------------------------
## EMQX_BASE_IMAGE current os centos:7 ## EMQX_BASE_IMAGE current os centos:7
## EMQX_ZIP_PACKAGE _packages/<current-zip-target> /tmp/emqx-4.4.0-otp23.3.4.9-3-centos7-amd64.zip ## EMQX_ZIP_PACKAGE _packages/<current-zip-target> /tmp/emqx-4.4.0-otp24.1.5-3-centos7-amd64.zip
## EMQX_IMAGE_TAG emqx/emqx:<current-vns-rel> emqx/emqx:testing-tag ## EMQX_IMAGE_TAG emqx/emqx:<current-vns-rel> emqx/emqx:testing-tag
## ##
make_docker_testing() { make_docker_testing() {

2
deploy/docker/Dockerfile
View File

@ -1,4 +1,4 @@
ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-2:23.3.4.9-3-alpine3.14 ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-4:24.1.5-3-alpine3.14
ARG RUN_FROM=alpine:3.14 ARG RUN_FROM=alpine:3.14
FROM ${BUILD_FROM} AS builder FROM ${BUILD_FROM} AS builder