Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 8 additions & 8 deletions Schutzfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
{
"title": "fedora-updates",
"name": "fedora-updates",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f44/f44-x86_64-updates-released-20260607"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f44/f44-x86_64-updates-released-20260628"
}
],
"aarch64": [
Expand All @@ -57,7 +57,7 @@
{
"title": "fedora-updates",
"name": "fedora-updates",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f44/f44-aarch64-updates-released-20260607"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f44/f44-aarch64-updates-released-20260628"
}
]
}
Expand All @@ -71,34 +71,34 @@
{
"title": "baseos",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20260524"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20260628"
},
{
"title": "appstream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20260524"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20260628"
},
{
"title": "crb",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-crb-20260524"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-crb-20260628"
}
],
"aarch64": [
{
"title": "baseos",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20260524"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20260628"
},
{
"title": "appstream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20260524"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20260628"
},
{
"title": "crb",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-crb-20260524"
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-crb-20260628"
}
]
}
Expand Down
10 changes: 10 additions & 0 deletions cmd/boot-aws/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,16 @@ func setup(cmd *cobra.Command, args []string) {

func doTeardown(aws *awscloud.AWS, res *resources) error {
if res.InstanceID != nil {
// Dump serial console output before terminating for debugging boot failures
consoleOutput, err := aws.GetConsoleOutputEC2(*res.InstanceID)
if err != nil {
fmt.Fprintf(os.Stderr, "warning: failed to get console output: %v\n", err)
} else if consoleOutput != "" {
fmt.Println("--- instance console output ---")
fmt.Println(consoleOutput)
fmt.Println("--- end console output ---")
}

fmt.Printf("terminating instance %s\n", *res.InstanceID)
if _, err := aws.TerminateInstancesEC2([]string{*res.InstanceID}, time.Hour); err != nil {
return fmt.Errorf("failed to terminate instance: %v", err)
Expand Down
17 changes: 17 additions & 0 deletions pkg/cloud/awscloud/awscloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,23 @@ func (a *AWS) RunInstanceEC2(imageID, secGroupID, userData, instanceType string)
}

// TerminateInstancesEC2 terminates the specified EC2 instances and waits for them to be terminated if timeout is greater than 0.
// GetConsoleOutputEC2 retrieves the serial console output for an instance.
// This is useful for debugging boot failures.
func (a *AWS) GetConsoleOutputEC2(instanceID string) (string, error) {
res, err := a.ec2.GetConsoleOutput(
context.TODO(),
&ec2.GetConsoleOutputInput{
InstanceId: &instanceID,
})
if err != nil {
return "", err
}
if res.Output == nil {
return "", nil
}
return *res.Output, nil
}

func (a *AWS) TerminateInstancesEC2(instanceIDs []string, timeout time.Duration) (*ec2.TerminateInstancesOutput, error) {
res, err := a.ec2.TerminateInstances(
context.TODO(),
Expand Down
4 changes: 4 additions & 0 deletions pkg/cloud/awscloud/awscloud_mock_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ func (f *fakeEC2Client) DescribeInstances(ctx context.Context, input *ec2.Descri
return f.describeInstances, nil
}

func (f *fakeEC2Client) GetConsoleOutput(ctx context.Context, input *ec2.GetConsoleOutputInput, optFns ...func(*ec2.Options)) (*ec2.GetConsoleOutputOutput, error) {
return &ec2.GetConsoleOutputOutput{}, nil
}

func (f *fakeEC2Client) RunInstances(ctx context.Context, input *ec2.RunInstancesInput, optFns ...func(*ec2.Options)) (*ec2.RunInstancesOutput, error) {
f.runInstancesCalls = append(f.runInstancesCalls, input)
if f.runInstancesErr != nil {
Expand Down
1 change: 1 addition & 0 deletions pkg/cloud/awscloud/client_interfaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ type ec2Client interface {

// Instances
DescribeInstances(context.Context, *ec2.DescribeInstancesInput, ...func(*ec2.Options)) (*ec2.DescribeInstancesOutput, error)
GetConsoleOutput(context.Context, *ec2.GetConsoleOutputInput, ...func(*ec2.Options)) (*ec2.GetConsoleOutputOutput, error)
RunInstances(context.Context, *ec2.RunInstancesInput, ...func(*ec2.Options)) (*ec2.RunInstancesOutput, error)
TerminateInstances(context.Context, *ec2.TerminateInstancesInput, ...func(*ec2.Options)) (*ec2.TerminateInstancesOutput, error)

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-aarch64-ami-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-aarch64-ec2-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-aarch64-tar-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-aarch64-vhd-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-aarch64-wsl-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-ppc64le-tar-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-s390x-qcow2-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-s390x-tar-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-ami-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-ec2-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-gce-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-oci-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-ova-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-tar-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-vhd-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-vmdk-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-wsl-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_9-aarch64-ami-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_9-aarch64-ec2-empty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading