Skip to content

kola: add upgrade test from latest ocp rhcos #2459

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

Merged
mike-nguyen merged 1 commit into from
Oct 15, 2021
Merged

kola: add upgrade test from latest ocp rhcos #2459

Show file tree
Hide file tree
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
26 changes: 1 addition & 25 deletions mantle/cmd/kola/kola.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ import (
"io/ioutil"
"net/http"
"os"
"os/exec"
"path/filepath"
"sort"
"strings"
"text/tabwriter"

"github.com/coreos/pkg/capnslog"
Expand Down Expand Up @@ -526,7 +524,7 @@ func syncFindParentImageOptions() error {
}
qcowURL := parentBaseURL + parentCosaBuild.BuildArtifacts.Qemu.Path
qcowLocal := filepath.Join(qemuImageDir, parentCosaBuild.BuildArtifacts.Qemu.Path)
decompressedQcowLocal, err := downloadImageAndDecompress(qcowURL, qcowLocal, skipSignature)
decompressedQcowLocal, err := util.DownloadImageAndDecompress(qcowURL, qcowLocal, skipSignature)
if err != nil {
return err
}
Expand All @@ -548,28 +546,6 @@ func syncFindParentImageOptions() error {
return nil
}

// Note this is a no-op if the decompressed dest already exists.
func downloadImageAndDecompress(url, compressedDest string, skipSignature bool) (string, error) {
var decompressedDest = strings.TrimSuffix(strings.TrimSuffix(compressedDest, ".xz"), ".gz")
if exists, err := util.PathExists(decompressedDest); err != nil {
return "", err
} else if !exists {
targetdir := filepath.Dir(decompressedDest)
downloadArgs := []string{"download", "--decompress", "-C", targetdir}
if skipSignature {
downloadArgs = append(downloadArgs, "--insecure")
}
downloadArgs = append(downloadArgs, []string{"-u", url}...)
cmd := exec.Command("coreos-installer", downloadArgs...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
return "", err
}
}
return decompressedDest, nil
}

// Returns the URL to a parent build that can be used as a base for upgrade
// testing.
func getParentFcosBuildBase(stream string) (string, error) {
Expand Down
Loading