Skip to content

Commit 66f611c

Browse files
def-def-
authored
Merge pull request #34198 from def-/pr-publish-back
ci: Bring back the publish-helm-charts pipeline
2 parents 260f9da + ecc46ec commit 66f611c

File tree

7 files changed

+134
-16
lines changed

7 files changed

+134
-16
lines changed

‎ci/deploy/pipeline.template.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,3 @@ steps:
4747
queue: linux-x86_64-small
4848
concurrency: 1
4949
concurrency_group: deploy/npm
50-
51-
- id: deploy-helm-chart
52-
label: ":rocket: :helm:"
53-
command: bin/ci-builder run stable misc/helm-charts/publish.sh
54-
depends_on: "deploy-docker"
55-
branches: "v*.*"
56-
timeout_in_minutes: 30
57-
agents:
58-
queue: linux-aarch64-small
59-
concurrency: 1
60-
concurrency_group: deploy/helm_chart

‎ci/publish-helm-charts/pipeline.template.yml‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Copyright Materialize, Inc. and contributors. All rights reserved.
2+
#
3+
# Use of this software is governed by the Business Source License
4+
# included in the LICENSE file at the root of this repository.
5+
#
6+
# As of the Change Date specified in that file, in accordance with
7+
# the Business Source License, use of this software will be governed
8+
# by the Apache License, Version 2.0.
9+
# This file is processed by mkpipeline.py to trim unnecessary steps in PR
10+
# builds. The inputs for steps using the `mzcompose` plugin are computed
11+
# automatically. Inputs for other steps need to be manually listed in the
12+
# `inputs` key.
13+
dag: true
14+
steps:
15+
- group: "Orchestratord tests"
16+
key: orchestratord-test
17+
steps:
18+
- id: orchestratord-defaults
19+
label: "Orchestratord test (defaults from documentation)"
20+
timeout_in_minutes: 120
21+
plugins:
22+
- ./ci/plugins/mzcompose:
23+
composition: orchestratord
24+
run: defaults
25+
args: ["--tag=$CI_MZ_VERSION"]
26+
ci-builder: stable
27+
env:
28+
# Old versions are not on GHCR yet
29+
MZ_GHCR: 0
30+
agents:
31+
queue: hetzner-aarch64-16cpu-32gb
32+
33+
- id: orchestratord-default-properties
34+
label: "Orchestratord test (defaults for properties)"
35+
timeout_in_minutes: 120
36+
plugins:
37+
- ./ci/plugins/mzcompose:
38+
composition: orchestratord
39+
args: ["--tag=$CI_MZ_VERSION", --action=noop, --properties=defaults, --recreate-cluster, --no-orchestratord-override]
40+
ci-builder: stable
41+
env:
42+
# Old versions are not on GHCR yet
43+
MZ_GHCR: 0
44+
agents:
45+
queue: hetzner-aarch64-16cpu-32gb
46+
47+
- id: orchestratord-individual
48+
label: "Orchestratord test (individual properties)"
49+
timeout_in_minutes: 120
50+
plugins:
51+
- ./ci/plugins/mzcompose:
52+
composition: orchestratord
53+
args: ["--tag=$CI_MZ_VERSION", --action=noop, --properties=individual, --recreate-cluster, --no-orchestratord-override]
54+
ci-builder: stable
55+
env:
56+
# Old versions are not on GHCR yet
57+
MZ_GHCR: 0
58+
agents:
59+
queue: hetzner-aarch64-16cpu-32gb
60+
61+
- id: orchestratord-combine
62+
label: "Orchestratord test (combine properties)"
63+
timeout_in_minutes: 120
64+
plugins:
65+
- ./ci/plugins/mzcompose:
66+
composition: orchestratord
67+
args: ["--tag=$CI_MZ_VERSION", --action=noop, --properties=combine, --runtime=3600, --recreate-cluster, --no-orchestratord-override]
68+
ci-builder: stable
69+
env:
70+
# Old versions are not on GHCR yet
71+
MZ_GHCR: 0
72+
agents:
73+
queue: hetzner-aarch64-16cpu-32gb
74+
75+
- id: terraform-aws-tag
76+
label: "Terraform + Helm Chart E2E on AWS (tagged)"
77+
artifact_paths: [test/terraform/aws-temporary/terraform.tfstate, "mz-debug/**/*"]
78+
timeout_in_minutes: 120
79+
concurrency: 1
80+
concurrency_group: 'terraform-aws'
81+
agents:
82+
queue: linux-aarch64-small
83+
plugins:
84+
- ./ci/plugins/scratch-aws-access: ~
85+
- ./ci/plugins/mzcompose:
86+
composition: terraform
87+
run: aws-temporary
88+
args: ["--tag=$CI_MZ_VERSION", --no-run-testdrive-files, --no-orchestratord-override]
89+
ci-builder: stable
90+
91+
- id: terraform-gcp-tag
92+
label: "Terraform + Helm Chart E2E on GCP (tagged)"
93+
artifact_paths: [test/terraform/gcp-temporary/terraform.tfstate, "mz-debug/**/*"]
94+
timeout_in_minutes: 120
95+
concurrency: 1
96+
concurrency_group: 'terraform-gcp'
97+
agents:
98+
queue: linux-aarch64-small
99+
plugins:
100+
- ./ci/plugins/mzcompose:
101+
composition: terraform
102+
run: gcp-temporary
103+
args: ["--tag=$CI_MZ_VERSION", --no-run-testdrive-files, --no-orchestratord-override]
104+
ci-builder: stable
105+
106+
- id: terraform-azure-tag
107+
label: "Terraform + Helm Chart E2E on Azure (tagged)"
108+
artifact_paths: [test/terraform/azure-temporary/terraform.tfstate, "mz-debug/**/*"]
109+
timeout_in_minutes: 120
110+
concurrency: 1
111+
concurrency_group: 'terraform-azure'
112+
agents:
113+
queue: linux-aarch64-small
114+
plugins:
115+
- ./ci/plugins/mzcompose:
116+
composition: terraform
117+
run: azure-temporary
118+
args: ["--tag=$CI_MZ_VERSION", --no-run-testdrive-files, --no-orchestratord-override]
119+
ci-builder: stable
120+
121+
- wait: ~
122+
123+
- id: helm-charts-publish
124+
label: Publish Helm Charts
125+
command: bin/ci-builder run stable misc/helm-charts/publish.sh
126+
timeout_in_minutes: 30
127+
agents:
128+
queue: linux-aarch64-small

‎misc/helm-charts/publish.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ if ! is_truthy "$CI_DRY_RUN"; then
122122
exit 1
123123
fi
124124

125-
HIGHEST_HELM_CHART_VERSION=$(echo "$YAML" | yq '.entries["materialize-operator"][].version' | grep -v beta | sort -V | tail -n 1)
125+
# sort -V doesn't do a proper semver sort, have to manually fix that, v26.0.0~rc.6 is considered to be less than v26.0.0
126+
HIGHEST_HELM_CHART_VERSION=$(echo "$YAML" | yq '.entries["materialize-operator"][].version' | grep -v beta | sed "s/-rc\./~rc./" | sort -V | tail -n 1)
126127

127128
if [ "$HIGHEST_HELM_CHART_VERSION" != "$BUILDKITE_TAG" ]; then
128129
echo "--- Higher helm-chart version $HIGHEST_HELM_CHART_VERSION > $BUILDKITE_TAG has already been released, not bumping terraform versions"

‎test/terraform/aws-persistent/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ variable "orchestratord_version" {
2727
}
2828

2929
module "materialize_infrastructure" {
30-
source = "git::https://github.com/MaterializeInc/terraform-aws-materialize.git?ref=v0.6.3"
30+
source = "git::https://github.com/MaterializeInc/terraform-aws-materialize.git?ref=v0.6.4"
3131

3232
# Basic settings
3333
namespace = "aws-persistent"

‎test/terraform/aws-temporary/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ variable "orchestratord_version" {
5151
}
5252

5353
module "materialize_infrastructure" {
54-
source = "git::https://github.com/MaterializeInc/terraform-aws-materialize.git?ref=v0.6.3"
54+
source = "git::https://github.com/MaterializeInc/terraform-aws-materialize.git?ref=v0.6.4"
5555

5656
providers = {
5757
aws = aws

‎test/terraform/aws-upgrade/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ variable "orchestratord_version" {
5151
}
5252

5353
module "materialize_infrastructure" {
54-
source = "git::https://github.com/MaterializeInc/terraform-aws-materialize.git?ref=v0.6.3"
54+
source = "git::https://github.com/MaterializeInc/terraform-aws-materialize.git?ref=v0.6.4"
5555

5656
providers = {
5757
aws = aws

‎test/terraform/azure-temporary/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ resource "azurerm_resource_group" "materialize" {
6060
}
6161

6262
module "materialize" {
63-
source = "git::https://github.com/MaterializeInc/terraform-azurerm-materialize.git?ref=v0.6.3"
63+
source = "git::https://github.com/MaterializeInc/terraform-azurerm-materialize.git?ref=v0.6.4"
6464
resource_group_name = azurerm_resource_group.materialize.name
6565
location = "eastus2"
6666
prefix = "mz-tf-test"

0 commit comments

Comments
 (0)