Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomasBrady committed Dec 6, 2024
1 parent 71255e3 commit e1eebc6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/App/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ open System.Threading


type KubeOption(kubeConfig: string, namespaceProperty: string option) =
[<Option('k', "kubeconfig", HelpText = "Kubernetes config file test extra strings in help to see if correct supercluster is running", Required = false, Default = "~/.kube/config")>]
[<Option('k', "kubeconfig", HelpText = "Kubernetes config file", Required = false, Default = "~/.kube/config")>]
member self.KubeConfig = kubeConfig

[<Option("namespace", HelpText = "Namespace to use, overriding kubeconfig.", Required = false)>]
Expand Down Expand Up @@ -460,7 +460,7 @@ type MissionOptions
member self.NumRuns = numRuns

[<Option("catchup-skip-known-results-for-testing",
HelpText = "skip known results for testing",
HelpText = "when this flag is probided, pubnet parallel catchup workers will run with CATCHUP_SKIP_KNOWN_RESULTS_FOR_TESTING = true",
Required = false,
Default = false)>]
member self.CatchupSkipKnownResultsForTesting = catchupSkipKnownResultsForTesting
Expand Down
4 changes: 2 additions & 2 deletions src/FSLibrary/MissionHistoryPubnetParallelCatchupV2.fs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ open k8s

// Constants
let helmReleaseName = "parallel-catchup"
let helmChartPath = "src/MissionParallelCatchup/parallel_catchup_helm"
let helmChartPath = "/supercluster/src/MissionParallelCatchup/parallel_catchup_helm"
let valuesFilePath = helmChartPath + "/values.yaml"
let jobMonitorHostName = "ssc-job-monitor.services.stellar-ops.com"
let jobMonitorStatusEndPoint = "/status"
Expand Down Expand Up @@ -80,7 +80,7 @@ let installProject (context: MissionContext) =
setOptions.Add(sprintf "monitor.logging_interval_seconds=%d" jobMonitorLoggingIntervalSecs)

// comment out the line below when doing local testing
//Environment.SetEnvironmentVariable("KUBECONFIG", context.kubeCfg)
Environment.SetEnvironmentVariable("KUBECONFIG", context.kubeCfg)

runCommand [| "helm"
"install"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ while true; do
# Fetch the next job key from the Redis queue.
# Our ranges are generated in the order we want to run them from left to right, so we always pull from the left
JOB_KEY=$(redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" LMOVE "$JOB_QUEUE" "$PROGRESS_QUEUE" LEFT LEFT)
echo "BEGIN CONFIG"
cat /config/stellar-core.cfg
echo "END CONFIG"

if [ -n "$JOB_KEY" ]; then
# Start timer
START_TIME=$(date +%s)
Expand Down

0 comments on commit e1eebc6

Please sign in to comment.