diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72902fc10c9d761f95b12b63675308b611ef08f2..f6595c476066ffc6e76fae3b57fb4eb5aad405f8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,6 @@ stages: - build - gather_bins - protect_bins - - test_bins - test - deploy @@ -88,6 +87,10 @@ do-build-arm64: tags: - arm64 + +# +# gather artifacts and ship them tox 86 boxes +# .gather-bins: &do_gather stage: gather_bins script: @@ -95,7 +98,7 @@ do-build-arm64: artifacts: expire_in: 1 day paths: - - test_binaries/ + - artifacts/ gather-bins-arm32: <<: *do_gather @@ -107,6 +110,55 @@ gather-bins-arm64: tags: - arm64 +# +# gather artifacts and ship them tox 86 boxes +# +.protect-arm-bins: &prot_bins + stage: protect_bins + script: + - ./cicd_testing/do-prot-bins.sh + artifacts: + expire_in: 1 day + paths: + - artifacts/ + +protect-arm-ubuntu18: + <<: *prot_bins + tags: + - ubuntu18 + +protect-bins-ubuntu16: + <<: *prot_bins + tags: + - ubuntu16 + +protect-bins-centos76: + <<: *prot_bins + tags: + - centos76 +# +# gather artifacts and ship them tox 86 boxes +# +test_arm_bins: &test_arm_bins + stage: test + script: + - ./cicd_testing/do-test-bins.sh + artifacts: + expire_in: 1 day + paths: + - artifacts/ + +gather-bins-arm32: + <<: *prot_bins + tags: + - arm32 + +gather-bins-arm64: + <<: *prot_bins + tags: + - arm64 + + # # test_quick for EH handling # diff --git a/cicd_testing/do-gather-bins.sh b/cicd_testing/do-gather-bins.sh index 3a5b19bd0707b9a649bc41ee979978c6fd8b8727..ea9a9e4f2eeb25531da7d264dc11b4dc23204cd0 100755 --- a/cicd_testing/do-gather-bins.sh +++ b/cicd_testing/do-gather-bins.sh @@ -3,8 +3,8 @@ set -x set -e -mkdir -p test_binaries/ +mkdir -p artifacts/test_binaries/ -cp $(which ls) test_binaries/ls.$(uname -m) -cp $(which bzip2) test_binaries/ls.$(uname -m) +cp $(which ls) artifacts/test_binaries/ls.$(uname -m) +cp $(which bzip2) artifacts/test_binaries/ls.$(uname -m) ls diff --git a/cicd_testing/do-prot-bins.sh b/cicd_testing/do-prot-bins.sh new file mode 100644 index 0000000000000000000000000000000000000000..04f899dbd00d2f1169273ffb76463b5adb7e334d --- /dev/null +++ b/cicd_testing/do-prot-bins.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +set -e +set -x + +mkdir -p artifacts/protected_binaries + +main() +{ + for i in $(ls artifacts/test_binaries/); do + $PSZ $i artifacts/protected_binaries/$(basename $i.$(hostname)) + done +} + + +main "$@" diff --git a/cicd_testing/do-test-bins.sh b/cicd_testing/do-test-bins.sh new file mode 100644 index 0000000000000000000000000000000000000000..dc9d0f36e5f075fc3d9115756efc59f4641fcca9 --- /dev/null +++ b/cicd_testing/do-test-bins.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +set -e +set -x + +main() +{ + for i in $(ls artifacts/protected_binaries/); do + $i --help + done +} + + +main "$@"