From e6a4a8bf6bcf79f6edd5d8b7ed1ac151c23632b7 Mon Sep 17 00:00:00 2001
From: Timo Furrer <tfurrer@gitlab.com>
Date: Tue, 30 Jan 2024 07:58:37 +0100
Subject: [PATCH] Improve warn job message in backports
---
backports/.Base.latest.gitlab-ci.yml | 9 +++++----
backports/OpenTofu/Base.latest.gitlab-ci.yml | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/backports/.Base.latest.gitlab-ci.yml b/backports/.Base.latest.gitlab-ci.yml
index 9cee4fc..46542ad 100644
--- a/backports/.Base.latest.gitlab-ci.yml
+++ b/backports/.Base.latest.gitlab-ci.yml
@@ -34,11 +34,12 @@ opentofu:use-component-instead-of-template:
image: alpine:3.19
script:
- |
- echo "You are using the OpenTofu CI/CD template on GitLab.com which is not recommended."
- echo "This template is available for self-managed customers until CI/CD components are available to them and it will be removed asap."
+ echo "You are using the OpenTofu CI/CD template on GitLab.com, which is not recommended."
+ echo "This template is available for self-managed users only until CI/CD components are "
+ echo "available. See https://gitlab.com/gitlab-org/gitlab/-/issues/415638"
echo " "
- echo "We recommend that you migrate to the OpenTofu CI/CD component instead."
- echo "The OpenTofu CI/CD component with a default configuration can be included as follows:"
+ echo "You should use the OpenTofu CI/CD component instead."
+ echo "To include the CI/CD component with a default configuration:"
echo " "
echo "include:"
echo " - component: gitlab.com/components/opentofu/full-pipeline@<VERSION>"
diff --git a/backports/OpenTofu/Base.latest.gitlab-ci.yml b/backports/OpenTofu/Base.latest.gitlab-ci.yml
index 2ca5904..5600b23 100644
--- a/backports/OpenTofu/Base.latest.gitlab-ci.yml
+++ b/backports/OpenTofu/Base.latest.gitlab-ci.yml
@@ -34,11 +34,12 @@ opentofu:use-component-instead-of-template:
image: alpine:3.19
script:
- |
- echo "You are using the OpenTofu CI/CD template on GitLab.com which is not recommended."
- echo "This template is available for self-managed customers until CI/CD components are available to them and it will be removed asap."
+ echo "You are using the OpenTofu CI/CD template on GitLab.com, which is not recommended."
+ echo "This template is available for self-managed users only until CI/CD components are "
+ echo "available. See https://gitlab.com/gitlab-org/gitlab/-/issues/415638"
echo " "
- echo "We recommend that you migrate to the OpenTofu CI/CD component instead."
- echo "The OpenTofu CI/CD component with a default configuration can be included as follows:"
+ echo "You should use the OpenTofu CI/CD component instead."
+ echo "To include the CI/CD component with a default configuration:"
echo " "
echo "include:"
echo " - component: gitlab.com/components/opentofu/full-pipeline@<VERSION>"
--
GitLab