Skip to content

Commit

Permalink
Merge pull request confidential-containers#475 from ldoktor/build-onl…
Browse files Browse the repository at this point in the history
…y-current-arch

actions: Build only current arch in e2e testing
  • Loading branch information
wainersm authored Jan 14, 2025
2 parents 48c6f93 + ceabe96 commit fc492f9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ccruntime_e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@ jobs:
cd tests/e2e
export PATH="$PATH:/usr/local/bin"
args="-u"
export pre_install_payload_archs="linux/amd64"
if [ $RUNNING_INSTANCE = "s390x-large" ]; then
args=""
export pre_install_payload_archs="linux/s390x"
elif [ "$RUNNING_INSTANCE" == "ubuntu-20.04" ] || [ "$RUNNING_INSTANCE" == "ubuntu-22.04" ]; then
# Remove the pre-installed docker/containerd
sudo apt-get remove docker* containerd* -y
Expand Down
9 changes: 2 additions & 7 deletions install/pre-install-payload/payload.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,10 @@ official_containerd_repo=${official_containerd_repo:-"https://github.com/contain
vfio_gpu_containerd_repo=${vfio_gpu_containerd_repo:-"https://github.com/confidential-containers/containerd"}
nydus_snapshotter_repo=${nydus_snapshotter_repo:-"https://github.com/containerd/nydus-snapshotter"}
extra_docker_manifest_flags="${extra_docker_manifest_flags:-}"
archs=${pre_install_payload_archs:-"linux/amd64 linux/s390x linux/arm64"}

registry="${registry:-quay.io/confidential-containers/reqs-payload}"

supported_arches=(
"linux/amd64"
"linux/s390x"
"linux/arm64"
)

function setup_env_for_arch() {
case "$1" in
"linux/amd64")
Expand Down Expand Up @@ -58,7 +53,7 @@ function build_payload() {
tag=$(git rev-parse HEAD)

manifest_args=()
for arch in "${supported_arches[@]}"; do
for arch in ${archs}; do
setup_env_for_arch "${arch}"

echo "Building containerd payload image for ${arch}"
Expand Down

0 comments on commit fc492f9

Please sign in to comment.