Merge topic 'ci-os-arch'

c922722ec0 Merge branch 'backport-ci-os-arch' into ci-os-arch
2bf1ce6cc3 gitlab-ci: drop unnecessary linux kernel version tag on 3.25 release branch
429574a94e gitlab-ci: replace '$os' tags with '$os-x86_64' on 3.25 release branch

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7995