diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33d0615776178b053f07cff5e0c7f0c891b0b571..2599fb76bad0ee9998b84b3e8dfd4c4470b05f01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,29 +100,6 @@ eh-tests-centos75: tags: - centos75 -# -# test_cmds.sh rida-p1 -# -.basic-pgms-rida-p1: &basic-pgms-rida-p1 - stage: test - script: - - ./cicd_testing/basic-pgms-rida-p1.sh - -basic-pgms-rida-p1-ubuntu18: - <<: *basic-pgms-rida-p1 - tags: - - ubuntu18 - -basic-pgms-rida-p1-ubuntu16: - <<: *basic-pgms-rida-p1 - tags: - - ubuntu16 - -basic-pgms-rida-p1-centos75: - <<: *basic-pgms-rida-p1 - tags: - - centos75 - # # test_cmds.sh fixcalls # @@ -179,27 +156,3 @@ elfdep-centos75: variables: OS: 'centos75' -# -# test_cmds.sh kill_deads -# -.basic-pgms-killdeads: &basic-pgms-killdeads - stage: test - script: - - ./cicd_testing/basic-pgms-killdeads.sh - -basic-pgms-killdeads-ubuntu18: - <<: *basic-pgms-killdeads - tags: - - ubuntu18 - -basic-pgms-killdeads-ubuntu16: - <<: *basic-pgms-killdeads - tags: - - ubuntu16 - -basic-pgms-killdeads-centos75: - <<: *basic-pgms-killdeads - tags: - - centos75 - variables: - OS: 'centos75' diff --git a/cicd_testing/basic-pgms-killdeads.sh b/cicd_testing/basic-pgms-killdeads.sh deleted file mode 100755 index 74980b6a52b40182ae3867eef41fa37ed9be2c35..0000000000000000000000000000000000000000 --- a/cicd_testing/basic-pgms-killdeads.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -e -set -x - -cd /tmp/peasoup_test -source set_env_vars -cd $PEASOUP_HOME/tests -make clean; -./test_cmds.sh -c kill_deads_rida -l -a "tcpdump" -./test_cmds.sh -c kill_deads -l -a "bzip2" - diff --git a/cicd_testing/basic-pgms-rida-p1.sh b/cicd_testing/basic-pgms-rida-p1.sh deleted file mode 100755 index ceb39308c33c992a62ba68fb73706493e2c0e58e..0000000000000000000000000000000000000000 --- a/cicd_testing/basic-pgms-rida-p1.sh +++ /dev/null @@ -1,10 +0,0 @@ -#/bin/bash -set -e -set -x - -cd /tmp/peasoup_test -source set_env_vars -cd $PEASOUP_HOME/tests -make clean -./test_cmds.sh -l -c rida_p1 -