Skip to content
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

Jump to bottom

test: Add checkout kbs helper script #2105

Merged
merged 2 commits into from
Oct 10, 2024
+44 −52
Merged

test: Add checkout kbs helper script #2105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d27be20
test: Add checkout kbs helper script
stevenhorsman Oct 10, 2024
1152148
workflow: Fix kustomize permissions issues
stevenhorsman Oct 10, 2024
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
16 changes: 2 additions & 14 deletions .github/workflows/azure-e2e-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,21 +235,9 @@ jobs:
- name: Extract kbs reference
run: echo "KBS_VERSION=$(yq -e '.git.kbs.reference' versions.yaml)" >> "$GITHUB_ENV"

- name: Checkout kbs Repository
- name: Checkout KBS Repository
run: |
rm -rf test/trustee
git clone https://github.com/confidential-containers/trustee test/trustee
pushd test/trustee
git checkout "${KBS_VERSION}"
pushd kbs/config/kubernetes/base/
# Trustee only updates their staging image reliably with sha tags,
# so switch to use that and convert the version to the sha
KBS_SHA=$(gh api repos/confidential-containers/trustee/commits/${KBS_VERSION} -q .sha)
kustomize edit set image kbs-container-image=ghcr.io/confidential-containers/staged-images/kbs:${KBS_SHA}
# For debugging
echo "Trustee deployment: $(cat kustomization.yaml). Images: $(cat kustomization.yaml | grep -A 5 images:)"
popd
popd
test/utils/checkout_kbs.sh

- name: Run e2e test
env:
Expand Down
22 changes: 2 additions & 20 deletions .github/workflows/e2e_libvirt.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,27 +106,9 @@ jobs:
curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | \
bash -s /usr/local/bin

- name: Checkout kbs Repository and build kbs-client
- name: Checkout KBS Repository
run: |
sudo apt-get update -y
sudo apt-get install -y build-essential pkg-config libssl-dev
git clone "${KBS_REPO}" test/trustee
pushd test/trustee
git checkout "${KBS_VERSION}"
pushd kbs
make CLI_FEATURES=sample_only cli
pushd config/kubernetes/base/
# Trustee only updates their staging image reliably with sha tags,
# so switch to use that and convert the version to the sha
KBS_SHA=$(gh api repos/confidential-containers/trustee/commits/${KBS_VERSION} -q .sha)
kustomize edit set image kbs-container-image=ghcr.io/confidential-containers/staged-images/kbs:${KBS_SHA}
# For debugging
echo "Trustee deployment: $(cat kustomization.yaml). Images: $(cat kustomization.yaml | grep -A 5 images:)"
popd
popd
# For debugging
ls ./target/release
popd
test/utils/checkout_kbs.sh
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
19 changes: 2 additions & 17 deletions src/cloud-api-adaptor/test/e2e/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,25 +57,10 @@ $ RUN_TESTS=CreateSimplePod TEST_PROVISION=yes TEST_PODVM_IMAGE="path/to/podvm-b
## Attestation and KBS specific

We need artifacts from the trustee repo when doing the attestation tests.
To prepare trustee, execute the following steps:
To prepare trustee, execute the following helper script:

```sh
pushd ${cloud-api-adaptor-repo-dir}/src/cloud-api-adaptor/test
git clone https://github.com/confidential-containers/trustee.git
pushd trustee
KBS_VERSION=$(../../hack/yq-shim.sh '.git.kbs.reference' ../../versions.yaml)
git checkout ${KBS_VERSION}
pushd kbs
pushd config/kubernetes/base/
# Trustee only updates their staging image reliably with sha tags,
# so switch to use that and convert the version to the sha
KBS_SHA=$(gh api repos/confidential-containers/trustee/commits/${KBS_VERSION} -q .sha)
kustomize edit set image kbs-container-image=ghcr.io/confidential-containers/staged-images/kbs:${KBS_SHA}
popd
make CLI_FEATURES=sample_only cli
popd
popd
popd
${cloud-api-adaptor-repo-dir}/src/cloud-api-adaptor/test/utils/checkout_kbs.sh
```

We need build and use the PodVM image:
Expand Down
36 changes: 36 additions & 0 deletions src/cloud-api-adaptor/test/utils/checkout_kbs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#!/bin/bash
#
# Copyright (c) 2024 IBM Corporation
#
# SPDX-License-Identifier: Apache-2.0

set -euo pipefail

TEST_DIR=$(cd "$(dirname "$(realpath "$0")")/../"; pwd)

VERSIONS_YAML_PATH=$(realpath "${TEST_DIR}/../versions.yaml")

KBS_REPO=$(yq -e '.git.kbs.url' "${VERSIONS_YAML_PATH}")
mkulke marked this conversation as resolved.
Show resolved Hide resolved
KBS_VERSION=$(yq -e '.git.kbs.reference' "${VERSIONS_YAML_PATH}")

echo "${KBS_REPO}, ${KBS_VERSION}"

rm -rf "${TEST_DIR}/trustee"
git clone "${KBS_REPO}" "${TEST_DIR}/trustee"
pushd "${TEST_DIR}/trustee"
git checkout "${KBS_VERSION}"

# kbs-client setup - to be removed when we use the cached version instead
sudo apt-get update -y
sudo apt-get install -y build-essential pkg-config libssl-dev
pushd kbs
make CLI_FEATURES=sample_only cli
popd

pushd kbs/config/kubernetes/base/
# Trustee only updates their staging image reliably with sha tags,
# so switch to use that and convert the version to the sha
KBS_SHA=$(gh api repos/confidential-containers/trustee/commits/${KBS_VERSION} -q .sha)
kustomize edit set image kbs-container-image=ghcr.io/confidential-containers/staged-images/kbs:${KBS_SHA}
# For debugging
echo "Trustee deployment: $(cat kustomization.yaml). Images: $(grep -A 5 images: kustomization.yaml)"
Loading