Skip to content

Commit

Permalink
Merge #1793
Browse files Browse the repository at this point in the history
1793: ci: switch from jenkins to github actions r=tiagolobocastro a=tiagolobocastro

    Jenkins has become troublesome to maintain and makes it harder for users
    to see and test output without adding new users.
    We could probably spend some time improving that, but the current Jenkins
    is also setup on systems managed by the sponsoring company so it makes
    sense to move away from that at least.
    In order to run the CI tests we need a relatively powerful CI system so
    we are making use of the ubuntu-latest-16-cores runners.

    The tests seem to run slower than on Jenkins. Part of it may be explained
    because the dependencies are not pre-cache and also the pre-requisites
    which take time to install.

    Signed-off-by: Tiago Castro <[email protected]>

Co-authored-by: Tiago Castro <[email protected]>
  • Loading branch information
mayastor-bors and tiagolobocastro committed Jan 8, 2025
2 parents 37f0fbe + 7e67468 commit 39612c3
Show file tree
Hide file tree
Showing 40 changed files with 408 additions and 119 deletions.
62 changes: 62 additions & 0 deletions .github/workflows/bdd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: BDD CI
on:
workflow_call:

env:
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: 0
CI: 1

jobs:
bdd-tests:
runs-on: ubuntu-latest-16-cores
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: 'recursive'
- uses: DeterminateSystems/nix-installer-action@v14
- uses: DeterminateSystems/magic-nix-cache-action@v8
- name: Pre-populate nix-shell
run: |
export NIX_PATH=nixpkgs=$(jq '.nixpkgs.url' nix/sources.json -r)
echo "NIX_PATH=$NIX_PATH" >> $GITHUB_ENV
nix-shell --run "echo" shell.nix
- name: Handle Rust dependencies caching
uses: Swatinem/rust-cache@v2
- name: Build binaries
run: nix-shell --run "cargo build --bins --features=io-engine-testing"
- name: Setup Test Pre-Requisites
run: |
sudo sysctl -w vm.nr_hugepages=2560
sudo apt-get install linux-modules-extra-$(uname -r)
for module in nvme_tcp nbd nvme_rdma; do
sudo modprobe $module
done
# for the coredump check
sudo apt-get install gdb
- name: Setup VENV
run: nix-shell --run "./test/python/setup.sh"
- name: Run BDD Tests
run: |
echo "TEST_START_DATE=$(date +"%Y-%m-%d %H:%M:%S")" >> $GITHUB_ENV
nix-shell --run "./scripts/pytest-tests.sh"
- name: Test Report
if: always()
uses: pmeier/pytest-results-action@main
with:
path: test/python/reports/**/xunit-report.xml
summary: true
display-options: a
fail-on-empty: true
title: Test results
- name: Cleanup
if: always()
run: nix-shell --run "./scripts/pytest-tests.sh --clean-all-exit"
- name: Check Coredumps
run: sudo ./scripts/check-coredumps.sh --since "${TEST_START_DATE}"
# debugging
# - name: Setup tmate session
# if: ${{ failure() }}
# timeout-minutes: 240
# uses: mxschmitt/action-tmate@v3
20 changes: 20 additions & 0 deletions .github/workflows/image-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: ImageBuild CI
on:
workflow_call:

env:
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: 0
CI: 1

jobs:
image-build-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- uses: DeterminateSystems/nix-installer-action@v14
- uses: DeterminateSystems/magic-nix-cache-action@v8
- name: Test building the release images
run: ./scripts/release.sh --skip-publish --build-bins
30 changes: 30 additions & 0 deletions .github/workflows/image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Image Push
on:
push:
branches:
- develop
- 'release/**'
tags:
- 'v[0-9]+.[0-9]+.[0-9]+**'

env:
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: 0
CI: 1

jobs:
image-build-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- uses: DeterminateSystems/nix-installer-action@v14
- uses: DeterminateSystems/magic-nix-cache-action@v8
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push the release images
run: ./scripts/release.sh
35 changes: 35 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Linter CI
on:
workflow_call:

env:
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: 0
CI: 1

jobs:
code-linter:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- uses: DeterminateSystems/nix-installer-action@v14
- uses: DeterminateSystems/magic-nix-cache-action@v8
- name: Pre-populate nix-shell
run: |
export NIX_PATH=nixpkgs=$(jq '.nixpkgs.url' nix/sources.json -r)
echo "NIX_PATH=$NIX_PATH" >> $GITHUB_ENV
nix-shell --run "echo" shell.nix
- name: Handle Rust dependencies caching
uses: Swatinem/rust-cache@v2
- name: Lint rust code
run: |
nix-shell --run "FMT_OPTS=--check ./scripts/rust-style.sh"
nix-shell --run "./scripts/rust-linter.sh"
- name: Lint JS code
run: nix-shell --run "./scripts/js-check.sh"
- name: Lint python code
run: nix-shell --run "black --diff --check test/python"
- name: Lint Nix code
run: nix-shell --run "nixpkgs-fmt --check ."
15 changes: 15 additions & 0 deletions .github/workflows/nightly-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Nightly CI
on:
workflow_dispatch:

jobs:
ci:
uses: ./.github/workflows/pr-ci.yml
nightly-ci:
if: ${{ success() }}
needs:
- ci
runs-on: ubuntu-latest
steps:
- name: CI succeeded
run: exit 0
28 changes: 28 additions & 0 deletions .github/workflows/pr-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Bors CI
on:
workflow_call:
push:
branches:
- staging
- trying

jobs:
lint-ci:
uses: ./.github/workflows/lint.yml
int-ci:
uses: ./.github/workflows/unit-int.yml
bdd-ci:
uses: ./.github/workflows/bdd.yml
image-ci:
uses: ./.github/workflows/image-pr.yml
bors-ci:
if: ${{ success() }}
needs:
- lint-ci
- int-ci
- bdd-ci
- image-ci
runs-on: ubuntu-latest
steps:
- name: CI succeeded
run: exit 0
76 changes: 76 additions & 0 deletions .github/workflows/unit-int.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: Integration CI
on:
workflow_call:

env:
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: 0
CI: 1

jobs:
int-tests:
runs-on: ubuntu-latest-16-cores
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: 'recursive'
- uses: DeterminateSystems/nix-installer-action@v14
- uses: DeterminateSystems/magic-nix-cache-action@v8
- name: Pre-populate nix-shell
run: |
export NIX_PATH=nixpkgs=$(jq '.nixpkgs.url' nix/sources.json -r)
echo "NIX_PATH=$NIX_PATH" >> $GITHUB_ENV
nix-shell --run "echo" shell.nix
- name: Handle Rust dependencies caching
uses: Swatinem/rust-cache@v2
with:
save-if: ${{ startsWith(github.ref_name, 'release/') || github.ref_name == 'develop' }}
- name: Build binaries
run: nix-shell --run "cargo build --bins --features=io-engine-testing"
- name: Setup Test Pre-Requisites
run: |
sudo sysctl -w vm.nr_hugepages=3584
sudo apt-get install linux-modules-extra-$(uname -r)
for module in nvme_tcp nbd nvme_rdma; do
sudo modprobe $module
done
sudo apt-get install gdb
- name: Run Rust Tests
run: |
echo "TEST_START_DATE=$(date +"%Y-%m-%d %H:%M:%S")" >> $GITHUB_ENV
nix-shell --run "./scripts/cargo-test.sh"
- name: Cleanup
if: always()
run: nix-shell --run "./scripts/clean-cargo-tests.sh"
- name: Check Coredumps
run: sudo ./scripts/check-coredumps.sh --since "${TEST_START_DATE}"
- name: Run JS Grpc Tests
run: |
echo "TEST_START_DATE=$(date +"%Y-%m-%d %H:%M:%S")" >> $GITHUB_ENV
nix-shell --run "./scripts/grpc-test.sh"
mkdir js-reports
for file in *-xunit-report.xml; do
echo "<testsuites>" > "js-reports/$file"
cat $file >> "js-reports/$file"
echo "</testsuites>" >> "js-reports/$file"
done
- name: Test Report
if: always()
uses: pmeier/pytest-results-action@main
with:
path: 'js-reports/*-xunit-report.xml'
summary: true
display-options: a
fail-on-empty: true
title: Test results
- name: Cleanup
if: always()
run: nix-shell --run "./scripts/clean-cargo-tests.sh"
- name: Check Coredumps
run: sudo ./scripts/check-coredumps.sh --since "${TEST_START_DATE}"
# debugging
# - name: Setup tmate session
# if: ${{ failure() }}
# timeout-minutes: 240
# uses: mxschmitt/action-tmate@v3
6 changes: 3 additions & 3 deletions io-engine-tests/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ pub fn mount_and_get_md5(device: &str) -> Result<String, String> {
pub fn fio_run_verify(device: &str) -> Result<String, String> {
let (exit, stdout, stderr) = run_script::run(
r"
fio --name=randrw --rw=randrw --ioengine=libaio --direct=1 --time_based=1 \
$FIO --name=randrw --rw=randrw --ioengine=libaio --direct=1 --time_based=1 \
--runtime=5 --bs=4k --verify=crc32 --group_reporting=1 --output-format=terse \
--verify_fatal=1 --verify_async=2 --filename=$1
",
Expand Down Expand Up @@ -511,11 +511,11 @@ pub async fn wait_for_rebuild(dst_uri: String, state: RebuildState, timeout: Dur
pub fn fio_verify_size(device: &str, size: u64) -> i32 {
let (exit, stdout, stderr) = run_script::run(
r"
fio --thread=1 --numjobs=1 --iodepth=16 --bs=512 \
$FIO --thread=1 --numjobs=1 --iodepth=16 --bs=512 \
--direct=1 --ioengine=libaio --rw=randwrite --verify=crc32 \
--verify_fatal=1 --name=write_verify --filename=$1 --size=$2
fio --thread=1 --numjobs=1 --iodepth=16 --bs=512 \
$FIO --thread=1 --numjobs=1 --iodepth=16 --bs=512 \
--direct=1 --ioengine=libaio --verify=crc32 --verify_only \
--verify_fatal=1 --name=verify --filename=$1
",
Expand Down
2 changes: 1 addition & 1 deletion io-engine/.cargo/runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
ARGS="${@}"

if [[ $EUID -ne 0 ]]; then
MAYBE_SUDO='sudo -E'
MAYBE_SUDO='sudo -E --preserve-env=PATH'
else
MAYBE_SUDO=''
fi
Expand Down
2 changes: 1 addition & 1 deletion io-engine/tests/ftl_mount_fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ async fn ftl_mount_fs_multiple() {
pub fn csal_fio_run_verify(device: &str) -> Result<String, String> {
let (exit, stdout, stderr) = run_script::run(
r#"
fio --name=randrw --rw=randrw --ioengine=libaio --direct=1 --time_based=1 \
$FIO --name=randrw --rw=randrw --ioengine=libaio --direct=1 --time_based=1 \
--runtime=10 --bs=64k --verify=crc32 --group_reporting=1 \
--verify_fatal=1 --verify_async=2 --filename=$1
"#,
Expand Down
6 changes: 6 additions & 0 deletions libnvme-rs/src/nvme_uri.rs
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,12 @@ impl NvmeTarget {
}
}

impl Drop for NvmeTarget {
fn drop(&mut self) {
self.disconnect().ok();
}
}

#[test]
fn nvme_parse_uri() {
let target = NvmeTarget::try_from("nvmf://1.2.3.4:1234/testnqn.what-ever.foo").unwrap();
Expand Down
2 changes: 1 addition & 1 deletion scripts/grpc-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ set -euxo pipefail
export PATH="$PATH:${HOME}/.cargo/bin"
export npm_config_jobs=$(nproc)

cargo build --all
cargo build --bins --features=io-engine-testing
cd "$(dirname "$0")/../test/grpc"
npm install --legacy-peer-deps

Expand Down
4 changes: 0 additions & 4 deletions scripts/nvmx-test.sh

This file was deleted.

1 change: 1 addition & 0 deletions test/python/common/hdl.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Common code that represents a mayastor handle."""

import mayastor_pb2 as pb
import grpc
import mayastor_pb2_grpc as rpc
Expand Down
10 changes: 5 additions & 5 deletions test/python/cross-grpc-version/nexus/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ services:
container_name: "ms0"
image: rust:latest
environment:
- MY_POD_IP=10.0.0.2
- MY_POD_IP=10.1.0.2
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
- ASAN_OPTIONS=detect_leaks=0
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 1,2 -r /tmp/ms0.sock
networks:
mayastor_net:
ipv4_address: 10.0.0.2
ipv4_address: 10.1.0.2
cap_add:
# NUMA related
- SYS_ADMIN
Expand All @@ -36,15 +36,15 @@ services:
container_name: "ms1"
image: rust:latest
environment:
- MY_POD_IP=10.0.0.3
- MY_POD_IP=10.1.0.3
- NEXUS_NVMF_ANA_ENABLE=1
- NEXUS_NVMF_RESV_ENABLE=1
- PATH=${LLVM_SYMBOLIZER_DIR:-}
- ASAN_OPTIONS=detect_leaks=0
command: ${SRCDIR}/${IO_ENGINE_DIR}/io-engine -g 0.0.0.0 -l 3,4 -r /tmp/ms1.sock
networks:
mayastor_net:
ipv4_address: 10.0.0.3
ipv4_address: 10.1.0.3
cap_add:
# NUMA related
- SYS_ADMIN
Expand All @@ -66,4 +66,4 @@ networks:
ipam:
driver: default
config:
- subnet: "10.0.0.0/16"
- subnet: "10.1.0.0/16"
Loading

0 comments on commit 39612c3

Please sign in to comment.