Skip to content
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@
make build
make build-cross
make test
make test-integration

storage_cross_task:
only_if: *only_if_storage
Expand Down Expand Up @@ -317,7 +318,7 @@
# Status aggregator for all tests. This task simply ensures a defined
# set of tasks all passed, and allows confirming that based on the status
# of this task.
success_task:

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: fedora-42 vfs", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: fedora-42 overlay", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: fedora-42 overlay-transient", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: fedora-42 fuse-overlay", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: fedora-42 fuse-overlay-whiteout", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: fedora-42 btrfs", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: debian-13 vfs", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: debian-13 overlay", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: debian-13 fuse-overlay", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: debian-13 fuse-overlay-whiteout", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: debian-13 btrfs", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Image: Cross", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Image: Test", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Image: Test w/ opengpg", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Test w/ Sequoia (currently Rawhide)", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Image: Skopeo Test", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Image: Skopeo Test w/ opengpg", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Skopeo Test w/ Sequoia (currently Rawhide)", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: Cross", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: gofix", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: fedora-42 vfs", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: fedora-42 overlay", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: fedora-42 overlay-transient", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: fedora-42 fuse-overlay", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: fedora-42 fuse-overlay-whiteout", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: fedora-42 btrfs", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: debian-13 vfs", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: debian-13 overlay", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: debian-13 fuse-overlay", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: debian-13 fuse-overlay-whiteout", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: debian-13 btrfs", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Image: Cross", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Image: Test", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Image: Test w/ opengpg", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Test w/ Sequoia (currently Rawhide)", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Image: Skopeo Test", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Image: Skopeo Test w/ opengpg", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Skopeo Test w/ Sequoia (currently Rawhide)", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: Cross", but their only_if conditions are different

Check warning on line 321 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L321

task "Total Success" depends on task "Storage: gofix", but their only_if conditions are different
alias: success
# N/B: The prow merge-bot (tide) is sensitized to this exact name, DO NOT CHANGE IT.
# Ref: https://github.com/openshift/release/pull/49820
Expand Down
8 changes: 8 additions & 0 deletions common/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,14 @@ test-unit: netavark-testplugin
go test --tags seccomp,$(BUILDTAGS) -v ./...
go test --tags remote,$(BUILDTAGS) -v ./pkg/config

.PHONY: bin/json-proxy-test-server
bin/json-proxy-test-server:
$(GO_BUILD) -o $@ ./cmd/json-proxy-test-server/

.PHONY: test-integration
test-integration: bin/json-proxy-test-server
JSON_PROXY_TEST_BINARY=$(CURDIR)/bin/json-proxy-test-server go test --tags $(BUILDTAGS) -v ./pkg/json-proxy/

clean: ## Clean artifacts
$(MAKE) -C docs clean
find . -name \*~ -delete
Expand Down
49 changes: 49 additions & 0 deletions common/cmd/json-proxy-test-server/main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
//go:build !windows

package main

import (
"context"
"fmt"
"os"
"strconv"

"go.podman.io/common/pkg/json-proxy"
"go.podman.io/image/v5/signature"
"go.podman.io/image/v5/types"
)

func main() {
if err := run(); err != nil {
fmt.Fprintf(os.Stderr, "error: %v\n", err)
os.Exit(1)
}
}

func run() error {
if len(os.Args) < 3 || os.Args[1] != "--sockfd" {
return fmt.Errorf("usage: %s --sockfd <fd>", os.Args[0])
}
sockfd, err := strconv.Atoi(os.Args[2])
if err != nil {
return fmt.Errorf("invalid sockfd: %v", err)
}

manager, err := jsonproxy.NewManager(
jsonproxy.WithSystemContext(func() (*types.SystemContext, error) {
return &types.SystemContext{}, nil
}),
jsonproxy.WithPolicyContext(func() (*signature.PolicyContext, error) {
policy, err := signature.DefaultPolicy(nil)
if err != nil {
return nil, err
}
return signature.NewPolicyContext(policy)
}),
)
if err != nil {
return err
}
defer manager.Close()
return manager.Serve(context.Background(), sockfd)
}
Loading
Loading