@@ -20,39 +20,39 @@ base_ubuntu:
20
20
base_ubuntu_srsgui :
21
21
stage : environment_base
22
22
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 .
24
24
- cd $CI_PROJECT_DIR/_gitlab-ci/docker/base-ubuntu
25
25
- docker build -t base_ubuntu_srsgui --target base_ubuntu_srsgui .
26
26
27
27
variant_minimal :
28
28
stage : environment_variants
29
29
script :
30
30
- 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} .
32
32
33
33
variant_cmnalib :
34
34
stage : environment_variants
35
35
script :
36
36
- 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 .
38
38
39
39
variant_cmnalib_uhd :
40
40
stage : environment_variants
41
41
script :
42
42
- 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 .
44
44
45
45
variant_uhd :
46
46
stage : environment_variants
47
47
script :
48
48
- 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 .
50
50
51
51
variant_full :
52
52
stage : environment_variants
53
53
script :
54
54
- 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 .
56
56
57
57
# variant_noradio:
58
58
# stage: environment_variants
@@ -86,32 +86,32 @@ sys_minimal:
86
86
variables :
87
87
GIT_SUBMODULE_STRATEGY : recursive
88
88
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
90
90
91
91
sys_cmnalib :
92
92
stage : system_test
93
93
variables :
94
94
GIT_SUBMODULE_STRATEGY : recursive
95
95
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
97
97
98
98
sys_cmnalib_uhd :
99
99
stage : system_test
100
100
variables :
101
101
GIT_SUBMODULE_STRATEGY : recursive
102
102
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
104
104
105
105
sys_uhd :
106
106
stage : system_test
107
107
variables :
108
108
GIT_SUBMODULE_STRATEGY : recursive
109
109
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
111
111
112
112
sys_full :
113
113
stage : system_test
114
114
variables :
115
115
GIT_SUBMODULE_STRATEGY : recursive
116
116
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