CI: merge variable declaration blocks

Fixes a broken master caused by !1757 (merged)

In !1757 (merged) we accidentally created a second top-level variables: declaration in .gitlab-ci.yml. This clobbered the variables defined higher up in the file. This MR fixes that problem by combining the two block in one declaration.