Skip to content

Commit

Permalink
CI: distribute CI jobs between CI systems
Browse files Browse the repository at this point in the history
Move podman, openj9, x86_64 tests from Travis to GitHub Actions.

Signed-off-by: Adrian Reber <[email protected]>
  • Loading branch information
adrianreber authored and avagin committed Nov 7, 2020
1 parent d8149f8 commit 21b4618
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 11 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/openj9-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: OpenJ9 Test

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Run OpenJ9 Test
run: sudo make -C scripts/ci openj9-test
11 changes: 11 additions & 0 deletions .github/workflows/podman-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Podman Test

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Run Podman Test
run: sudo make -C scripts/ci podman-test
11 changes: 11 additions & 0 deletions .github/workflows/x86-64-clang-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: X86_64 CLANG Test

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Run X86_64 CLANG Test
run: sudo make -C scripts/ci x86_64 CLANG=1
11 changes: 11 additions & 0 deletions .github/workflows/x86-64-gcc-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: X86_64 GCC Test

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Run X86_64 GCC Test
run: sudo make -C scripts/ci x86_64
7 changes: 0 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ env:
- TR_ARCH=local CLANG=1
- TR_ARCH=local COMPAT_TEST=y
- TR_ARCH=local CLANG=1 COMPAT_TEST=y
- TR_ARCH=x86_64
- TR_ARCH=x86_64 CLANG=1
- TR_ARCH=openj9-test
- TR_ARCH=vagrant-fedora-no-vdso
jobs:
include:
Expand Down Expand Up @@ -57,10 +54,6 @@ jobs:
arch: amd64
env: TR_ARCH=fedora-rawhide
dist: bionic
- os: linux
arch: amd64
env: TR_ARCH=podman-test
dist: bionic
- os: linux
arch: amd64
env: TR_ARCH=docker-test
Expand Down
2 changes: 2 additions & 0 deletions scripts/build/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ RUN apt-install \
git-core \
iptables \
libaio-dev \
libbsd-dev \
libcap-dev \
libgnutls28-dev \
libgnutls30 \
libnftables-dev \
libnl-3-dev \
libprotobuf-c-dev \
libprotobuf-dev \
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/Dockerfile.x86_64.hdr
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:xenial
FROM ubuntu:focal

COPY scripts/ci/apt-install /bin/apt-install

Expand Down
14 changes: 11 additions & 3 deletions scripts/ci/podman-test.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
#!/bin/bash
set -x -e -o pipefail

echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_18.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
if [ ! -e /etc/lsb-release ]; then
# This expects to run on Ubuntu
exit 1
fi

wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_18.04/Release.key -O- | apt-key add -
#shellcheck disable=SC1091
. /etc/lsb-release

echo "deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${DISTRIB_RELEASE}/ /" > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list

curl -sL "https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_${DISTRIB_RELEASE}/Release.key" | apt-key add -

# podman conflicts with a man page from docker-ce
# this is a podman packaging bug (https://github.com/containers/libpod/issues/4747)
apt-get -y purge docker-ce
apt-get -y purge docker-ce || :

./apt-install \
apt-transport-https \
Expand Down

0 comments on commit 21b4618

Please sign in to comment.