@@ -20,39 +20,39 @@ base_ubuntu:
2020base_ubuntu_srsgui :
2121 stage : environment_base
2222 script :
23- # - docker build -t $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}_base_ubuntu .
23+ # - docker build -t $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} _base_ubuntu .
2424 - cd $CI_PROJECT_DIR/_gitlab-ci/docker/base-ubuntu
2525 - docker build -t base_ubuntu_srsgui --target base_ubuntu_srsgui .
2626
2727variant_minimal :
2828 stage : environment_variants
2929 script :
3030 - cd $CI_PROJECT_DIR/_gitlab-ci/docker/variants
31- - docker build -t variant_minimal:${CI_COMMIT_REF_SLUG} .
31+ - docker build -t variant_minimal:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} .
3232
3333variant_cmnalib :
3434 stage : environment_variants
3535 script :
3636 - cd $CI_PROJECT_DIR/_gitlab-ci/docker/variants
37- - docker build -t variant_cmnalib:${CI_COMMIT_REF_SLUG} --build-arg INCLUDE_CMNALIB=true .
37+ - docker build -t variant_cmnalib:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} --build-arg INCLUDE_CMNALIB=true .
3838
3939variant_cmnalib_uhd :
4040 stage : environment_variants
4141 script :
4242 - cd $CI_PROJECT_DIR/_gitlab-ci/docker/variants
43- - docker build -t variant_cmnalib_uhd:${CI_COMMIT_REF_SLUG} --build-arg INCLUDE_CMNALIB=true --build-arg INCLUDE_UHD=true .
43+ - docker build -t variant_cmnalib_uhd:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} --build-arg INCLUDE_CMNALIB=true --build-arg INCLUDE_UHD=true .
4444
4545variant_uhd :
4646 stage : environment_variants
4747 script :
4848 - cd $CI_PROJECT_DIR/_gitlab-ci/docker/variants
49- - docker build -t variant_uhd:${CI_COMMIT_REF_SLUG} --build-arg INCLUDE_UHD=true .
49+ - docker build -t variant_uhd:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} --build-arg INCLUDE_UHD=true .
5050
5151variant_full :
5252 stage : environment_variants
5353 script :
5454 - cd $CI_PROJECT_DIR/_gitlab-ci/docker/variants
55- - docker build -t variant_full:${CI_COMMIT_REF_SLUG} --build-arg INCLUDE_CMNALIB=true --build-arg INCLUDE_UHD=true --build-arg INCLUDE_LIMESDR=true .
55+ - docker build -t variant_full:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} --build-arg INCLUDE_CMNALIB=true --build-arg INCLUDE_UHD=true --build-arg INCLUDE_LIMESDR=true .
5656
5757# variant_noradio:
5858 # stage: environment_variants
@@ -86,32 +86,32 @@ sys_minimal:
8686 variables :
8787 GIT_SUBMODULE_STRATEGY : recursive
8888 script :
89- - docker run -v `pwd`/.:/falcon -v /tmp:/tmp/tmp-host -i variant_minimal:${CI_COMMIT_REF_SLUG} /falcon/_gitlab-ci/testscripts/./test_all.sh ~/falcon-build /tmp
89+ - docker run -v `pwd`/.:/falcon -v /tmp:/tmp/tmp-host -i variant_minimal:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} /falcon/_gitlab-ci/testscripts/./test_all.sh ~/falcon-build /tmp
9090
9191sys_cmnalib :
9292 stage : system_test
9393 variables :
9494 GIT_SUBMODULE_STRATEGY : recursive
9595 script :
96- - docker run -v `pwd`/.:/falcon -i variant_cmnalib:${CI_COMMIT_REF_SLUG} /falcon/_gitlab-ci/testscripts/./test_all.sh ~/falcon-build /tmp
96+ - docker run -v `pwd`/.:/falcon -i variant_cmnalib:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} /falcon/_gitlab-ci/testscripts/./test_all.sh ~/falcon-build /tmp
9797
9898sys_cmnalib_uhd :
9999 stage : system_test
100100 variables :
101101 GIT_SUBMODULE_STRATEGY : recursive
102102 script :
103- - docker run -v `pwd`/.:/falcon -i variant_cmnalib_uhd:${CI_COMMIT_REF_SLUG} /falcon/_gitlab-ci/testscripts/./test_all.sh ~/falcon-build /tmp
103+ - docker run -v `pwd`/.:/falcon -i variant_cmnalib_uhd:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} /falcon/_gitlab-ci/testscripts/./test_all.sh ~/falcon-build /tmp
104104
105105sys_uhd :
106106 stage : system_test
107107 variables :
108108 GIT_SUBMODULE_STRATEGY : recursive
109109 script :
110- - docker run -v `pwd`/.:/falcon -i variant_uhd:${CI_COMMIT_REF_SLUG} /falcon/_gitlab-ci/testscripts/./test_all.sh ~/falcon-build /tmp
110+ - docker run -v `pwd`/.:/falcon -i variant_uhd:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} /falcon/_gitlab-ci/testscripts/./test_all.sh ~/falcon-build /tmp
111111
112112sys_full :
113113 stage : system_test
114114 variables :
115115 GIT_SUBMODULE_STRATEGY : recursive
116116 script :
117- - docker run -v `pwd`/.:/falcon -i variant_full:${CI_COMMIT_REF_SLUG} /falcon/_gitlab-ci/testscripts/./test_all.sh ~/falcon-build /tmp
117+ - docker run -v `pwd`/.:/falcon -i variant_full:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} /falcon/_gitlab-ci/testscripts/./test_all.sh ~/falcon-build /tmp
0 commit comments