From 1a32c7972ad1054ffaa873b6d244a42fadba0d3a Mon Sep 17 00:00:00 2001 From: Jason Hiser <jdhiser@gmail.com> Date: Mon, 4 Mar 2019 16:12:09 -0500 Subject: [PATCH] moving some tests to cookbook --- .gitlab-ci.yml | 47 ---------------------------- cicd_testing/basic-pgms-killdeads.sh | 11 ------- cicd_testing/basic-pgms-rida-p1.sh | 10 ------ 3 files changed, 68 deletions(-) delete mode 100755 cicd_testing/basic-pgms-killdeads.sh delete mode 100755 cicd_testing/basic-pgms-rida-p1.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33d061577..2599fb76b 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 74980b6a5..000000000 --- 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 ceb39308c..000000000 --- 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 - -- GitLab