Commit 678a28b0 authored by Arie Peterson's avatar Arie Peterson
Browse files

Merge branch 'v0.8' into 'pre-release/v0.8'

Solve merge conflicts (probably due to cherry-picking) by choosing the pre-release version.
# Conflicts:
#   .gitlab/ci_pipelines/default.yml
#   .gitlab/ci_pipelines/install_stackspin.yml
#   .gitlab/ci_pipelines/upgrade_test.yml
#   Dockerfile
#   flux2/apps/zulip/zulip-values-configmap.yaml
#   install/install-stackspin.sh
parents 999b9cb4 9250dae9
...@@ -76,7 +76,7 @@ report-ci-image-tag: ...@@ -76,7 +76,7 @@ report-ci-image-tag:
TAG_INFORMATION=$(curl -sS https://open.greenhost.net/api/v4/projects/stackspin%2Fstackspin/registry/repositories/73/tags/${CI_COMMIT_REF_SLUG}); TAG_INFORMATION=$(curl -sS https://open.greenhost.net/api/v4/projects/stackspin%2Fstackspin/registry/repositories/73/tags/${CI_COMMIT_REF_SLUG});
echo "Tag information: ${TAG_INFORMATION}" echo "Tag information: ${TAG_INFORMATION}"
if [ "$TAG_INFORMATION" == '{"message":"404 Tag Not Found"}' ]; then if [ "$TAG_INFORMATION" == '{"message":"404 Tag Not Found"}' ]; then
CI_CONTAINER_TAG="main" CI_CONTAINER_TAG="$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"
else else
CI_CONTAINER_TAG="${CI_COMMIT_REF_SLUG}" CI_CONTAINER_TAG="${CI_COMMIT_REF_SLUG}"
fi fi
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
- CHANGELOG.md - CHANGELOG.md
- if: '$TRIGGER_JOBS =~ /enable-.*/' - if: '$TRIGGER_JOBS =~ /enable-.*/'
- if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-/' - if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-/'
- if: '$CI_COMMIT_BRANCH == "main"' - if: '$CI_COMMIT_REF_PROTECTED == "true"'
# app rules # app rules
# #
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
- test/taiko/* - test/taiko/*
- if: '$TRIGGER_JOBS =~ /enable-monitoring/' - if: '$TRIGGER_JOBS =~ /enable-monitoring/'
- if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-monitoring/' - if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-monitoring/'
- if: '$CI_COMMIT_BRANCH == "main"' - if: '$CI_COMMIT_REF_PROTECTED == "true"'
.nextcloud_rules: .nextcloud_rules:
rules: rules:
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
- test/taiko/* - test/taiko/*
- if: '$TRIGGER_JOBS =~ /enable-nextcloud/' - if: '$TRIGGER_JOBS =~ /enable-nextcloud/'
- if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-nextcloud/' - if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-nextcloud/'
- if: '$CI_COMMIT_BRANCH == "main"' - if: '$CI_COMMIT_REF_PROTECTED == "true"'
.single_sign_on_rules: .single_sign_on_rules:
rules: rules:
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
- test/taiko/* - test/taiko/*
- if: '$TRIGGER_JOBS =~ /enable-single-sign-on/' - if: '$TRIGGER_JOBS =~ /enable-single-sign-on/'
- if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-single-sign-on/' - if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-single-sign-on/'
- if: '$CI_COMMIT_BRANCH == "main"' - if: '$CI_COMMIT_REF_PROTECTED == "true"'
.velero_rules: .velero_rules:
rules: rules:
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
- install/flux-version-check.sh - install/flux-version-check.sh
- if: '$TRIGGER_JOBS =~ /enable-velero/' - if: '$TRIGGER_JOBS =~ /enable-velero/'
- if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-velero/' - if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-velero/'
- if: '$CI_COMMIT_BRANCH == "main"' - if: '$CI_COMMIT_REF_PROTECTED == "true"'
.wekan_rules: .wekan_rules:
rules: rules:
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
- test/taiko/* - test/taiko/*
- if: '$TRIGGER_JOBS =~ /enable-wekan/' - if: '$TRIGGER_JOBS =~ /enable-wekan/'
- if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-wekan/' - if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-wekan/'
- if: '$CI_COMMIT_BRANCH == "main"' - if: '$CI_COMMIT_REF_PROTECTED == "true"'
.wordpress_rules: .wordpress_rules:
rules: rules:
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
- test/taiko/* - test/taiko/*
- if: '$TRIGGER_JOBS =~ /enable-wordpress/' - if: '$TRIGGER_JOBS =~ /enable-wordpress/'
- if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-wordpress/' - if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-wordpress/'
- if: '$CI_COMMIT_BRANCH == "main"' - if: '$CI_COMMIT_REF_PROTECTED == "true"'
.zulip_rules: .zulip_rules:
rules: rules:
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
- test/taiko/* - test/taiko/*
- if: '$TRIGGER_JOBS =~ /enable-zulip/' - if: '$TRIGGER_JOBS =~ /enable-zulip/'
- if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-zulip/' - if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-zulip/'
- if: '$CI_COMMIT_BRANCH == "main"' - if: '$CI_COMMIT_REF_PROTECTED == "true"'
# Common variables # Common variables
# ================ # ================
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment