diff options
author | Matias Elo <matias.elo@nokia.com> | 2022-03-25 15:39:04 +0200 |
---|---|---|
committer | Matias Elo <matias.elo@nokia.com> | 2022-10-07 09:57:20 +0300 |
commit | 5e2d80ee3dd8e5a4951730c05206dcb1e56517ed (patch) | |
tree | cb5581b0cfe232c6014e932bfe92d78e2e84ebb3 /.github | |
parent | 99017447a16e114a8921b1f098ad9a30cd934c49 (diff) |
github_ci: change default test image to ubuntu 20.04
Upgrade default test image from Ubuntu 18.04 to 20.04. i386 cross-
compilation stays on Ubuntu 18.04 as 20.04 dropped support for i386.
Default GCC version changes to 9 and Clang to 10.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/ci-pipeline-arm64.yml | 4 | ||||
-rw-r--r-- | .github/workflows/ci-pipeline.yml | 72 |
2 files changed, 28 insertions, 48 deletions
diff --git a/.github/workflows/ci-pipeline-arm64.yml b/.github/workflows/ci-pipeline-arm64.yml index 9d473a67a..b9257a6e2 100644 --- a/.github/workflows/ci-pipeline-arm64.yml +++ b/.github/workflows/ci-pipeline-arm64.yml @@ -236,8 +236,6 @@ jobs: Run_dpdk-20_11: if: ${{ github.repository == 'OpenDataPlane/odp' }} runs-on: [self-hosted, ARM64] - env: - OS: ubuntu_20.04 steps: - uses: AutoModality/action-clean@v1.1.0 - uses: actions/checkout@v2 @@ -250,8 +248,6 @@ jobs: Run_dpdk-21_11: if: ${{ github.repository == 'OpenDataPlane/odp' }} runs-on: [self-hosted, ARM64] - env: - OS: ubuntu_20.04 steps: - uses: AutoModality/action-clean@v1.1.0 - uses: actions/checkout@v2 diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index b7fc5f7dc..34e9431ba 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -5,7 +5,7 @@ env: ARCH: x86_64 CC: gcc CONTAINER_NAMESPACE: ghcr.io/opendataplane/odp-docker-images - OS: ubuntu_18.04 + OS: ubuntu_20.04 jobs: Checkpatch: @@ -121,46 +121,33 @@ jobs: runs-on: ubuntu-20.04 env: ARCH: arm64 + CONF: "--enable-dpdk-shared" strategy: fail-fast: false matrix: cc: [gcc, clang] + conf: ['', '--enable-abi-compat', 'CFLAGS=-march=armv8.2-a', 'CFLAGS=-march=armv8-a+lse', + '--with-crypto=armv8crypto'] steps: - uses: actions/checkout@v2 + - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}" + -e CONF="${CONF} ${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/build_${ARCH}.sh + - name: Failure log + if: ${{ failure() }} + run: find . -name config.log -exec cat {} \; - - name: Minimal - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}" - -e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/build_${ARCH}.sh - - - name: --enable-abi-compat - env: - CONF: "--enable-abi-compat" - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}" - -e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/build_${ARCH}.sh - - - name: CFLAGS="-march=armv8.2-a" - env: - CONF: "CFLAGS=-march=armv8.2-a" - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}" - -e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/build_${ARCH}.sh - - - name: CFLAGS="-march=armv8-a+lse" - env: - CONF: "CFLAGS=-march=armv8-a+lse" - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}" - -e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/build_${ARCH}.sh - - - name: "--with-crypto=armv8crypto" - env: - CONF: "--with-crypto=armv8crypto" - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}" - -e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/build_${ARCH}.sh - - - name: Ubuntu 20.04 - env: - CONF: "--enable-dpdk-shared" - OS: ubuntu_20.04 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.compiler}}" + Build_arm64_u18: + runs-on: ubuntu-20.04 + env: + ARCH: arm64 + OS: ubuntu_18.04 + strategy: + fail-fast: false + matrix: + cc: [gcc, clang] + steps: + - uses: actions/checkout@v2 + - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}" -e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/build_${ARCH}.sh - name: Failure log if: ${{ failure() }} @@ -187,6 +174,7 @@ jobs: runs-on: ubuntu-20.04 env: ARCH: ppc64el + CONF: "--enable-dpdk-shared" strategy: fail-fast: false matrix: @@ -195,7 +183,7 @@ jobs: steps: - uses: actions/checkout@v2 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}" - -e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/build_${ARCH}.sh + -e CONF="${CONF} ${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/build_${ARCH}.sh - name: Failure log if: ${{ failure() }} run: find . -name config.log -exec cat {} \; @@ -204,6 +192,7 @@ jobs: runs-on: ubuntu-20.04 env: ARCH: i386 + OS: ubuntu_18.04 strategy: fail-fast: false matrix: @@ -221,7 +210,6 @@ jobs: runs-on: ubuntu-20.04 env: ARCH: riscv64 - OS: ubuntu_20.04 strategy: fail-fast: false matrix: @@ -251,14 +239,14 @@ jobs: if: ${{ failure() }} run: find . -name config.log -exec cat {} \; - Build_gcc_u20: + Build_gcc_u18: runs-on: ubuntu-20.04 env: - OS: ubuntu_20.04 + OS: ubuntu_18.04 strategy: fail-fast: false matrix: - cc_ver: [9] + cc_ver: [7, 8] conf: ['', '--enable-abi-compat'] steps: - uses: actions/checkout@v2 @@ -362,7 +350,7 @@ jobs: fail-fast: false matrix: cc: [gcc, clang] - os: ['ubuntu_20.04', 'ubuntu_22.04'] + os: ['ubuntu_18.04', 'ubuntu_22.04'] steps: - uses: actions/checkout@v2 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}" -e ARCH="${ARCH}" @@ -436,8 +424,6 @@ jobs: Run_dpdk-20_11: runs-on: ubuntu-20.04 - env: - OS: ubuntu_20.04 steps: - uses: actions/checkout@v2 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}" @@ -448,8 +434,6 @@ jobs: Run_dpdk-21_11: runs-on: ubuntu-20.04 - env: - OS: ubuntu_20.04 steps: - uses: actions/checkout@v2 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}" |