Skip to content

Conversation

mzabaluev
Copy link
Contributor

Move the variables that are important for the Terraform configuration back to the Makefile. Deduplicate variable assignments in experiment.mk that are also present in Makefile. It's better to have the single place where these need to be defined, and I don't think the experiment parameters file is it.

Move the variables that are important for the Terraform configuration
back to the Makefile. Deduplicate variable assignments in experiment.mk
that are also present in Makefile. You gotta make up your mind on
the single place where these need to be defined, and I don't think
the experiment parameters are it.
@mzabaluev mzabaluev added the enhancement New feature or request label Jan 30, 2024
@mzabaluev mzabaluev requested a review from hvanz January 30, 2024 12:01
Makefile Outdated
Comment on lines 3 to 4
DO_INSTANCE_TAGNAME=main-testnet
DO_VPC_SUBNET=172.19.144.0/20
Copy link
Contributor Author

@mzabaluev mzabaluev Jan 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea behind moving these two variables together is that it's necessary to customize them both to deconflict QA testnet experiments running concurrently in the same project. If experiment.mk looks like a more appropriate place for this, let's move them both there.

@hvanz hvanz requested a review from lasarojc January 30, 2024 13:48
@lasarojc
Copy link
Contributor

I am good with the deduplication and agree that DO_VPC_SUBNET and DO_INSTANCE_TAGNAME should be together (it was my omission), but I think experiment.mk is the place to have, since DO_VPC_SUBNET is a also an experiment wide configuration.

@mzabaluev mzabaluev changed the title Deduplicate and move configuration vars out of experiment.mk Deduplicate and move configuration vars in a single place between Makefile and experiment.mk Jan 31, 2024
Same user might be running multiple experiments, and the intent is
to concentrate per-experiment customization to experiment.mk to
leave Makefile unchanged.
@mzabaluev
Copy link
Contributor Author

mzabaluev commented Jan 31, 2024

I am good with the deduplication and agree that DO_VPC_SUBNET and DO_INSTANCE_TAGNAME should be together (it was my omission), but I think experiment.mk is the place to have, since DO_VPC_SUBNET is a also an experiment wide configuration.

I've done as suggested, thanks.

I'm not sure if VERSION{,2}_TAG and VERSION{,2}_WEIGHT should also be considered part of the experiment configuration.

@lasarojc
Copy link
Contributor

Good point. Probably. But we can move them there once we start doing multi-version tests.

@mzabaluev mzabaluev merged commit 5bbdef8 into main Jan 31, 2024
@mzabaluev mzabaluev deleted the mikhail/consolidate-config-vars branch January 31, 2024 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants