ci: Move non-image-tag variables back to .gitlab-ci.yml

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3065#note_1563706

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3068>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86942ab..e6b7439 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,16 @@ variables:
   # Branch to track for modules that have no ref specified in the manifest
   GST_UPSTREAM_BRANCH: 'main'
 
+  GST_UPSTREAM_REPO: 'gstreamer/gstreamer'
+  FDO_UPSTREAM_REPO: 'gstreamer/gstreamer'
+
+  FEDORA_AMD64_SUFFIX: 'amd64/fedora'
+  INDENT_AMD64_SUFFIX: 'amd64/gst-indent'
+  WINDOWS_AMD64_SUFFIX: 'amd64/windows'
+
+  WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH"
+  WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$GST_UPSTREAM_REPO/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH"
+
   MESON_BUILDTYPE_ARGS: --default-library=both
   DEFAULT_MESON_ARGS: >
     -Dlibnice:tests=disabled

diff --git a/.gitlab-image-tags.yml b/.gitlab-image-tags.yml
index f0be626..c64c5a4 100644 (file)
--- a/.gitlab-image-tags.yml
+++ b/.gitlab-image-tags.yml
@@ -8,13 +8,3 @@ variables:
   FEDORA_TAG:  '2022-09-22.0'
   INDENT_TAG: '2022-03-07.1'
   WINDOWS_TAG: "2022-09-17.0"
-
-  GST_UPSTREAM_REPO: 'gstreamer/gstreamer'
-  FDO_UPSTREAM_REPO: 'gstreamer/gstreamer'
-
-  FEDORA_AMD64_SUFFIX: 'amd64/fedora'
-  INDENT_AMD64_SUFFIX: 'amd64/gst-indent'
-  WINDOWS_AMD64_SUFFIX: 'amd64/windows'
-
-  WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH"
-  WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$GST_UPSTREAM_REPO/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH"