Skip to content

hcpctl: prefer provision-environment config over write-config #5387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mmazur wants to merge 1 commit into
base: main
Choose a base branch
from
Open

hcpctl: prefer provision-environment config over write-config #5387

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions tooling/hcpctl/pkg/snapshot/prow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"compress/gzip"
"context"
"encoding/json"
"errors"
"fmt"
"io"
"net/url"
Expand All @@ -41,7 +42,8 @@ import (

const (
gcsBucket = "test-platform-results"
configPath = "aro-hcp-write-config/artifacts/config.yaml"
configPathPrimary = "aro-hcp-provision-environment/artifacts/config.yaml"
configPathFallback = "aro-hcp-write-config/artifacts/config.yaml"
testStepPersistent = "aro-hcp-test-persistent"
testStepLocal = "aro-hcp-test-local"
prKustoRegion = "eastus2"
Expand Down Expand Up @@ -166,11 +168,19 @@ func FetchProwJobData(ctx context.Context, info *ProwJobInfo) (*ProwJobConfig, [

artifactPrefix := fmt.Sprintf("%s/artifacts/%s", info.GCSPrefix, artifactDir)

// Download and parse config.yaml.
configGCSPath := fmt.Sprintf("%s/%s", artifactPrefix, configPath)
// Download and parse config.yaml, trying the primary path first.
configGCSPath := fmt.Sprintf("%s/%s", artifactPrefix, configPathPrimary)
configData, err := downloadObject(ctx, gcsClient, configGCSPath)
if err != nil {
return nil, nil, fmt.Errorf("failed to download config.yaml: %w", err)
if !errors.Is(err, storage.ErrObjectNotExist) {
return nil, nil, fmt.Errorf("failed to download config.yaml: %w", err)
}
logger.V(1).Info("Primary config not present, trying fallback", "primary", configGCSPath)
configGCSPath = fmt.Sprintf("%s/%s", artifactPrefix, configPathFallback)
configData, err = downloadObject(ctx, gcsClient, configGCSPath)
Comment on lines 173 to +180
if err != nil {
return nil, nil, fmt.Errorf("failed to download config.yaml: %w", err)
Comment on lines +176 to +182
}
}
Comment on lines 173 to 184

jobConfig, err := parseConfig(configData, info.JobName)
Expand Down