From d824c69e198dadb11c62d7925b859d7a8dd7563d Mon Sep 17 00:00:00 2001 From: Jonas Zohren Date: Sun, 18 Jul 2021 12:40:07 +0200 Subject: [PATCH] First and ugly attempt at integrating sytest This uses the valkum/sytest-conduit docker image which was created for the old CI system. It therefore has 'weird' paths which I am not cleaning up until it at least ran in GitLab CI --- .gitlab-ci.yml | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92da543..cc6ec49 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ stages: - - test - build + - test - upload artifacts variables: @@ -34,6 +34,35 @@ test:cargo: - cargo test --workspace --verbose --locked - cargo clippy + +test:sytest: + stage: "test" + allow_failure: true + needs: + - "build:cargo:x86_64-unknown-linux-musl" + image: + name: "valkum/sytest-conduit:latest" + entrypoint: [""] + tags: ["docker"] + variables: + PLUGINS: "https://github.com/valkum/sytest_conduit/archive/master.tar.gz" + before_script: + - "mkdir -p /app" + - "cp ./x86_64-unknown-linux-musl /app/conduit" + - "chmod +x /app/conduit" + - "mkdir -p /src/tests/sytest" + - "cp -r tests/sytest /src/tests/sytest" + - "mkdir -p /work/server-0/database/ && mkdir -p /work/server-1/database/ && mkdir -p /work/server-2/database/" + - "cd /" + script: + - "/bootstrap.sh conduit" + artifacts: + paths: + - "/logs/**/*.log" + - "/logs/**/*.log.*" + - "/logs/results.tap" + + # --------------------------------------------------------------------- # # Cargo: Compiling for different architectures # # --------------------------------------------------------------------- # @@ -97,6 +126,20 @@ build:cargo:aarch64-unknown-linux-gnu: TARGET_CC: "/usr/bin/aarch64-linux-gnu-gcc-8" TARGET_AR: "/usr/bin/aarch64-linux-gnu-gcc-ar-8" +build:cargo:x86_64-unknown-linux-musl: + extends: .build-cargo-shared-settings + image: "rust:alpine" + rules: + - if: '$CI_COMMIT_BRANCH' # Always run + variables: + TARGET: "x86_64-unknown-linux-musl" + before_script: + - 'echo "Building for target $TARGET"' + - 'mkdir -p cargohome && CARGOHOME="cargohome"' + - "cat /etc/*-release && rustc --version && cargo --version" # Print version info for debugging + - "rustup target add $TARGET" + - "apk add libc-dev" + # --------------------------------------------------------------------- # # Cargo: Compiling deb packages for different architectures # @@ -153,6 +196,7 @@ publish:package: - "build:cargo:x86_64-unknown-linux-gnu" - "build:cargo:armv7-unknown-linux-gnueabihf" - "build:cargo:aarch64-unknown-linux-gnu" + - "build:cargo:x86_64-unknown-linux-musl" - "build:cargo-deb:x86_64-unknown-linux-gnu" rules: - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' @@ -165,6 +209,7 @@ publish:package: - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file conduit-x86_64-unknown-linux-gnu "${BASE_URL}/conduit-x86_64-unknown-linux-gnu"' - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file conduit-armv7-unknown-linux-gnueabihf "${BASE_URL}/conduit-armv7-unknown-linux-gnueabihf"' - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file conduit-aarch64-unknown-linux-gnu "${BASE_URL}/conduit-aarch64-unknown-linux-gnu"' + - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file x86_64-unknown-linux-musl" ${BASE_URL}/conduit-x86_64-unknown-linux-musl"' - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file conduit-x86_64-unknown-linux-gnu.deb "${BASE_URL}/conduit-x86_64-unknown-linux-gnu.deb"'