status-im
/
cs-codex-dist-tests
mirror of
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removes docker images from config because they aren't configurable this way.

This commit is contained in:
benbierens 2023-07-11 14:56:40 +02:00
parent 17935f4c9e
commit 42acb862b6
No known key found for this signature in database
GPG Key ID: FE44815D96D0A1AA
3 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CodexNetDeployer/Configuration.cs
View File

@ -1,8 +1,6 @@
using ArgsUniform; using ArgsUniform;
using DistTestCore; using DistTestCore;
using DistTestCore.Codex; using DistTestCore.Codex;
using DistTestCore.Marketplace;
using DistTestCore.Metrics;
namespace CodexNetDeployer namespace CodexNetDeployer
{ {
@ -10,18 +8,6 @@ namespace CodexNetDeployer
{ {
public const int SecondsIn1Day = 24 * 60 * 60; public const int SecondsIn1Day = 24 * 60 * 60;
[Uniform("codex-image", "ci", "CODEXIMAGE", true, "Docker image of Codex.")]
public string CodexImage { get; set; } = CodexContainerRecipe.DockerImage;
[Uniform("geth-image", "gi", "GETHIMAGE", true, "Docker image of Geth.")]
public string GethImage { get; set; } = GethContainerRecipe.DockerImage;
[Uniform("contracts-image", "oi", "CONTRACTSIMAGE", true, "Docker image of Codex Contracts.")]
public string ContractsImage { get; set; } = CodexContractsContainerRecipe.DockerImage;
[Uniform("metrics-image", "mi", "METRICSIMAGE", true, "Docker image of Prometheus.")]
public string MetricsImage { get; set; } = PrometheusContainerRecipe.DockerImage;
[Uniform("kube-config", "kc", "KUBECONFIG", false, "Path to Kubeconfig file. Use 'null' (default) to use local cluster.")] [Uniform("kube-config", "kc", "KUBECONFIG", false, "Path to Kubeconfig file. Use 'null' (default) to use local cluster.")]
public string KubeConfigFile { get; set; } = "null"; public string KubeConfigFile { get; set; } = "null";
@ -55,12 +41,12 @@ namespace CodexNetDeployer
[Uniform("max-duration", "md", "MAXDURATION", true, "Maximum duration in seconds for contracts which will be accepted.")] [Uniform("max-duration", "md", "MAXDURATION", true, "Maximum duration in seconds for contracts which will be accepted.")]
public int MaxDuration { get; set; } public int MaxDuration { get; set; }
[Uniform("record-metrics", "rm", "RECORDMETRICS", false, "If true, metrics will be collected for all Codex nodes.")]
public bool RecordMetrics { get; set; } = false;
[Uniform("block-ttl", "bt", "BLOCKTTL", false, "Block timeout in seconds. Default is 24 hours.")] [Uniform("block-ttl", "bt", "BLOCKTTL", false, "Block timeout in seconds. Default is 24 hours.")]
public int BlockTTL { get; set; } = SecondsIn1Day; public int BlockTTL { get; set; } = SecondsIn1Day;
[Uniform("record-metrics", "rm", "RECORDMETRICS", false, "If true, metrics will be collected for all Codex nodes.")]
public bool RecordMetrics { get; set; } = false;
public TestRunnerLocation RunnerLocation { get; set; } = TestRunnerLocation.InternalToCluster; public TestRunnerLocation RunnerLocation { get; set; } = TestRunnerLocation.InternalToCluster;
public List<string> Validate() public List<string> Validate()

4
CodexNetDeployer/Deployer.cs
View File

@ -101,10 +101,6 @@ namespace CodexNetDeployer
private DeploymentMetadata CreateMetadata() private DeploymentMetadata CreateMetadata()
{ {
return new DeploymentMetadata( return new DeploymentMetadata(
codexImage: config.CodexImage,
gethImage: config.GethImage,
contractsImage: config.ContractsImage,
prometheusImage: config.MetricsImage,
kubeNamespace: config.KubeNamespace, kubeNamespace: config.KubeNamespace,
numberOfCodexNodes: config.NumberOfCodexNodes!.Value, numberOfCodexNodes: config.NumberOfCodexNodes!.Value,
numberOfValidators: config.NumberOfValidators!.Value, numberOfValidators: config.NumberOfValidators!.Value,

10
DistTestCore/Codex/CodexDeployment.cs
View File

@ -21,13 +21,9 @@ namespace DistTestCore.Codex
public class DeploymentMetadata public class DeploymentMetadata
{ {
public DeploymentMetadata(string codexImage, string gethImage, string contractsImage, string prometheusImage, string kubeNamespace, int numberOfCodexNodes, int numberOfValidators, int storageQuotaMB, CodexLogLevel codexLogLevel, int initialTestTokens, int minPrice, int maxCollateral, int maxDuration) public DeploymentMetadata(string kubeNamespace, int numberOfCodexNodes, int numberOfValidators, int storageQuotaMB, CodexLogLevel codexLogLevel, int initialTestTokens, int minPrice, int maxCollateral, int maxDuration)
{ {
DeployDateTimeUtc = DateTime.UtcNow; DeployDateTimeUtc = DateTime.UtcNow;
CodexImage = codexImage;
GethImage = gethImage;
ContractsImage = contractsImage;
PrometheusImage = prometheusImage;
KubeNamespace = kubeNamespace; KubeNamespace = kubeNamespace;
NumberOfCodexNodes = numberOfCodexNodes; NumberOfCodexNodes = numberOfCodexNodes;
NumberOfValidators = numberOfValidators; NumberOfValidators = numberOfValidators;
@ -39,11 +35,7 @@ namespace DistTestCore.Codex
MaxDuration = maxDuration; MaxDuration = maxDuration;
} }
public string CodexImage { get; }
public DateTime DeployDateTimeUtc { get; } public DateTime DeployDateTimeUtc { get; }
public string GethImage { get; }
public string ContractsImage { get; }
public string PrometheusImage { get; }
public string KubeNamespace { get; } public string KubeNamespace { get; }
public int NumberOfCodexNodes { get; } public int NumberOfCodexNodes { get; }
public int NumberOfValidators { get; } public int NumberOfValidators { get; }