diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c54f0371535bbe88a3b20499d2b899f2dc061fd..1156b08bbb5f4ab73de2fe8e3fd7a223360121a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,27 +82,28 @@ do-build-centos76: # -# simple test. +# test-p1 # # template -.simple: &simple +.test-p1: &test-p1 stage: test script: - ./cicd_tests/test-p1.sh -simple-ubuntu16: - <<: *simple +test-p1-ubuntu16: + <<: *test-p1 tags: - ubuntu16 - variables: - OS: 'ubuntu16' -simple-ubuntu18: - <<: *simple +test-p1-ubuntu18: + <<: *test-p1 tags: - ubuntu18 - variables: - OS: 'ubuntu18' + +test-p1-centos76: + <<: *test-p1 + tags: + - centos76 diff --git a/cicd_tests/do-build.sh b/cicd_tests/do-build.sh index 6368bdbe692a3a143e1e2dea7b8ddad114dee11f..dfc400fdf1b93209820f9ec749c147ea70019f1b 100755 --- a/cicd_tests/do-build.sh +++ b/cicd_tests/do-build.sh @@ -31,7 +31,7 @@ main() cd $orig_dir time rsync -a --exclude='.git' $CICD_TO_TEST_DIR/ /tmp/p1_test cd /tmp/p1_test - source set_env_var + source set_env_vars scons -j 3 } diff --git a/cicd_tests/test-p1.sh b/cicd_tests/test-p1.sh index c32382bded5374a03b54b1368b2e8ff0521981d7..5897c98b0123233e6fcc7b478eab58fb0c530baa 100755 --- a/cicd_tests/test-p1.sh +++ b/cicd_tests/test-p1.sh @@ -6,7 +6,7 @@ set -x cd $CICD_MODULE_WORK_DIR/p1_umbrella source set_env_vars cd /tmp/p1_test -source set_env_var +source set_env_vars main()