Skip to content

Commit bfd97d9

Browse files
authored
terraform test: re-enable aws terraform CI tests (#33789)
<!-- Describe the contents of the PR briefly but completely. If you write detailed commit messages, it is acceptable to copy/paste them here, or write "see commit messages for details." If there is only one commit in the PR, GitHub will have already added its commit message above. --> ### Motivation The yaml merge issue should now be fixed in v0.5.3 as per: MaterializeInc/terraform-aws-materialize#78 so re-enabling the tests. Successful run: https://buildkite.com/materialize/nightly/builds/13684#0199beaa-25ab-4cfb-ad35-bbe9211da59f <!-- Which of the following best describes the motivation behind this PR? * This PR fixes a recognized bug. [Ensure issue is linked somewhere.] * This PR adds a known-desirable feature. [Ensure issue is linked somewhere.] * This PR fixes a previously unreported bug. [Describe the bug in detail, as if you were filing a bug report.] * This PR adds a feature that has not yet been specified. [Write a brief specification for the feature, including justification for its inclusion in Materialize, as if you were writing the original feature specification.] * This PR refactors existing code. [Describe what was wrong with the existing code, if it is not obvious.] --> ### Tips for reviewer <!-- Leave some tips for your reviewer, like: * The diff is much smaller if viewed with whitespace hidden. * [Some function/module/file] deserves extra attention. * [Some function/module/file] is pure code movement and only needs a skim. Delete this section if no tips. --> ### Checklist - [ ] This PR has adequate test coverage / QA involvement has been duly considered. ([trigger-ci for additional test/nightly runs](https://trigger-ci.dev.materialize.com/)) - [ ] This PR has an associated up-to-date [design doc](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/README.md), is a design doc ([template](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/00000000_template.md)), or is sufficiently small to not require a design. <!-- Reference the design in the description. --> - [ ] If this PR evolves [an existing `$T ⇔ Proto$T` mapping](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/command-and-response-binary-encoding.md) (possibly in a backwards-incompatible way), then it is tagged with a `T-proto` label. - [ ] If this PR will require changes to cloud orchestration or tests, there is a companion cloud PR to account for those changes that is tagged with the release-blocker label ([example](MaterializeInc/cloud#5021)). <!-- Ask in #team-cloud on Slack if you need help preparing the cloud PR. --> - [ ] If this PR includes major [user-facing behavior changes](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/guide-changes.md#what-changes-require-a-release-note), I have pinged the relevant PM to schedule a changelog post.
1 parent a797642 commit bfd97d9

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

ci/nightly/pipeline.template.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,6 @@ steps:
14001400
args: [--no-cleanup]
14011401
ci-builder: stable
14021402
branches: "main v*.* *aws* *tf* *terraform* *helm* *self-managed* *orchestratord*"
1403-
skip: "https://github.com/MaterializeInc/terraform-aws-materialize/issues/71"
14041403

14051404
- id: terraform-aws-upgrade
14061405
label: "Terraform + Helm Chart Upgrade on AWS"

test/terraform/aws-temporary/main.tf

Lines changed: 1 addition & 7 deletions
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.5.2"
54+
source = "git::https://github.com/MaterializeInc/terraform-aws-materialize.git?ref=v0.5.3"
5555

5656
providers = {
5757
aws = aws
@@ -74,17 +74,11 @@ module "materialize_infrastructure" {
7474
install_cert_manager = false
7575
use_self_signed_cluster_issuer = false
7676

77-
# TODO: This currently fails: https://github.com/MaterializeInc/terraform-aws-materialize/issues/71
7877
helm_values = {
7978
operator = {
8079
args = {
8180
enableLicenseKeyChecks = true
8281
}
83-
clusters = {
84-
# Overriding here because merging values doesn't work.
85-
# Remove this when that is fixed.
86-
swap_enabled = false
87-
}
8882
},
8983
}
9084

0 commit comments

Comments
 (0)