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
294 changes: 169 additions & 125 deletions .github/workflows/pr-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ jobs:
- 'go.sum'
- '.goreleaser.yml'
- 'e2e/**'
- 'hack/microsandbox/**'
- 'hack/run-managed-policy-e2e.sh'
- '.github/workflows/pr-ci.yml'
- 'hack/licenses/**'
- 'hack/podman_ci/**'
Expand Down Expand Up @@ -292,14 +294,14 @@ jobs:
- name: download CLI artifacts
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
with:
pattern: devsy-${{ steps.os.outputs.runner_os }}
pattern: devsy-linux
path: ${{ runner.temp }}/devsy-bin/
merge-multiple: true

- name: download e2e test binary
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
with:
name: e2e-test-${{ steps.os.outputs.runner_os }}
name: e2e-test-linux
path: ./e2e/

- name: setup executable
Expand All @@ -324,6 +326,169 @@ jobs:
run: |
./e2e.test -test.v -ginkgo.v -test.timeout 1500s -ginkgo.fail-on-empty --ginkgo.label-filter="${{ matrix.label }}"

integration-tests-microsandbox:
name: Test ${{ matrix.label }} on ubuntu-latest
needs: [changes, build-cli]
if: needs.changes.outputs.go == 'true'
strategy:
fail-fast: false
matrix:
include:
- label: up-provider-microsandbox
expected-spec-count: 2
- label: up-provider-microsandbox-images
expected-spec-count: 6
- label: up-provider-microsandbox-mounts
expected-spec-count: 10
- label: up-provider-microsandbox-resources
expected-spec-count: 12
- label: up-provider-microsandbox-storage
expected-spec-count: 6
- label: up-provider-microsandbox-ephemeral
expected-spec-count: 6
- label: up-provider-microsandbox-egress
expected-spec-count: 4
- label: up-provider-microsandbox-prebuilds
expected-spec-count: 4
- label: up-provider-microsandbox-dockerless
expected-spec-count: 8
- label: up-provider-microsandbox-recreate
expected-spec-count: 4
- label: up-provider-microsandbox-managed-recreate
expected-spec-count: 4
- label: up-provider-microsandbox-logs-cancel
expected-spec-count: 6
runs-on: ubuntu-latest
timeout-minutes: 25
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7

- name: install gnupg2
run: sudo apt-get install -y gnupg2

- name: download CLI artifacts
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
with:
pattern: devsy-linux
path: ${{ runner.temp }}/devsy-bin/
merge-multiple: true

- name: download e2e test binary
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
with:
name: e2e-test-linux
path: ./e2e/

- name: setup executable
shell: bash
working-directory: ./e2e
run: |
ls -R "${RUNNER_TEMP}/devsy-bin/"
mkdir -p ./bin/
find "${RUNNER_TEMP}/devsy-bin/" -type f -name "devsy-*" -exec cp {} ./bin \;
find ./bin -name "devsy-*" -exec chmod +x {} \;
chmod +x ./e2e.test
ls -R ./bin/

- name: test Ginkgo report validator
run: python3 -m unittest discover -s hack/microsandbox -p 'test_*.py'

- name: cache microsandbox release bundle (Linux)
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: ${{ runner.temp }}/microsandbox-linux-x86_64-v0.7.7.tar.gz
key: ${{ runner.os }}-${{ runner.arch }}-microsandbox-bundle-v0.7.7

- name: install checksum-pinned microsandbox (Linux)
timeout-minutes: 5
run: |
archive="${RUNNER_TEMP}/microsandbox-linux-x86_64-v0.7.7.tar.gz"
if [ ! -f "$archive" ]; then
curl -fsSL --retry 3 -o "$archive" \
https://github.com/superradcompany/microsandbox/releases/download/v0.7.7/microsandbox-linux-x86_64.tar.gz
fi
echo "b3cc4a5e3f52dfdd938a6f67ac4a9a959ddfe304bab56de4964044b8613f01bb $archive" | sha256sum -c -
staging="$(mktemp -d)"
trap 'rm -rf "$staging"' EXIT
tar -xzf "$archive" -C "$staging"
mkdir -p "$HOME/.microsandbox/bin" "$HOME/.microsandbox/lib" "$HOME/.local/bin"
install -m 755 "$staging/msb" "$HOME/.microsandbox/bin/msb"
install -m 644 "$staging/libkrunfw.so.5.6.1" "$HOME/.microsandbox/lib/"
ln -sf libkrunfw.so.5.6.1 "$HOME/.microsandbox/lib/libkrunfw.so.5"
ln -sf libkrunfw.so.5 "$HOME/.microsandbox/lib/libkrunfw.so"
ln -sf "$HOME/.microsandbox/bin/msb" "$HOME/.local/bin/msb"
echo "$HOME/.local/bin" >> "$GITHUB_PATH"
"$HOME/.local/bin/msb" --version
sudo test -r /dev/kvm
sudo test -w /dev/kvm

- name: run MicroSandbox test
shell: bash
working-directory: ./e2e
env:
GH_USERNAME: ${{ github.repository_owner }}
GH_ACCESS_TOKEN: ${{ github.token }}
GH_CREDENTIAL_USERNAME: x-access-token
TEST_TIMEOUT: 1200s
DEVSY_REQUIRE_MICROSANDBOX: "true"
run: |
set -uo pipefail
report="${RUNNER_TEMP}/microsandbox-${{ matrix.label }}.json"
test_log="${RUNNER_TEMP}/microsandbox-${{ matrix.label }}.log"
command=(./e2e.test -test.v -ginkgo.v -test.timeout "${TEST_TIMEOUT}"
-ginkgo.fail-on-empty -ginkgo.flake-attempts=1
--ginkgo.label-filter="${{ matrix.label }}" -ginkgo.json-report="$report")
fixture_environment=()
if [ "${{ matrix.label }}" = "up-provider-microsandbox-managed-recreate" ]; then
command=(../hack/run-managed-policy-e2e.sh "${command[@]}")
fixture_environment=(DEVSY_REQUIRE_MSB_MANAGED_POLICY_FIXTURE=true "RUNNER_TEMP=${RUNNER_TEMP}")
fi
set +e
sudo \
DEVSY_REQUIRE_MICROSANDBOX="${DEVSY_REQUIRE_MICROSANDBOX}" \
GH_USERNAME="${GH_USERNAME}" \
GH_ACCESS_TOKEN="${GH_ACCESS_TOKEN}" \
GH_CREDENTIAL_USERNAME="${GH_CREDENTIAL_USERNAME}" \
KUBECONFIG="${KUBECONFIG:-$HOME/.kube/config}" \
${DOCKER_HOST:+DOCKER_HOST="${DOCKER_HOST}"} \
PATH="${PATH}" \
"${fixture_environment[@]}" "${command[@]}" 2>&1 | tee "$test_log"
pipeline_status=("${PIPESTATUS[@]}")
set -e
test_status=${pipeline_status[0]}
log_status=${pipeline_status[1]}
chown_status=0
if [ -e "$report" ]; then
sudo chown "$(id -u):$(id -g)" "$report" || chown_status=$?
fi
report_status=0
if [ "$chown_status" -ne 0 ]; then
echo "::error::could not make Ginkgo report readable for artifact upload"
report_status="$chown_status"
else
python3 ../hack/microsandbox/verify_report.py \
--report "$report" --label "${{ matrix.label }}" \
--expected-count "${{ matrix.expected-spec-count }}" || report_status=$?
fi
if [ "$test_status" -ne 0 ]; then
exit "$test_status"
fi
if [ "$log_status" -ne 0 ]; then
exit "$log_status"
fi
exit "$report_status"

- name: upload MicroSandbox test evidence
if: always()
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
with:
name: microsandbox-${{ matrix.label }}-evidence
path: |
${{ runner.temp }}/microsandbox-${{ matrix.label }}.json
${{ runner.temp }}/microsandbox-${{ matrix.label }}.log
if-no-files-found: warn
retention-days: 14

integration-tests:
name: Test ${{ matrix.label }}${{ (matrix.install-podman == 'rootless' || matrix.install-podman == 'rootful') && format(' ({0})', matrix.install-podman) || '' }} on ${{ matrix.runner }}
needs: [changes, can-read-secret, build-cli]
Expand Down Expand Up @@ -642,96 +807,6 @@ jobs:
install-kind: true
requires-secret: false

- label: up-provider-microsandbox
runner: ubuntu-latest
free-disk-space: false
install-kind: false
requires-secret: false
install-microsandbox: true
test-timeout: 1200s
job-timeout-minutes: 25

- label: up-provider-microsandbox-images
runner: ubuntu-latest
free-disk-space: false
install-kind: false
requires-secret: false
install-microsandbox: true
test-timeout: 1200s
job-timeout-minutes: 25

- label: up-provider-microsandbox-mounts
runner: ubuntu-latest
free-disk-space: false
install-kind: false
requires-secret: false
install-microsandbox: true
test-timeout: 1200s
job-timeout-minutes: 25

- label: up-provider-microsandbox-resources
runner: ubuntu-latest
free-disk-space: false
install-kind: false
requires-secret: false
install-microsandbox: true
test-timeout: 1200s
job-timeout-minutes: 25

- label: up-provider-microsandbox-storage
runner: ubuntu-latest
free-disk-space: false
install-kind: false
requires-secret: false
install-microsandbox: true
test-timeout: 1200s
job-timeout-minutes: 25

- label: up-provider-microsandbox-ephemeral
runner: ubuntu-latest
free-disk-space: false
install-kind: false
requires-secret: false
install-microsandbox: true
test-timeout: 1200s
job-timeout-minutes: 25

- label: up-provider-microsandbox-egress
runner: ubuntu-latest
free-disk-space: false
install-kind: false
requires-secret: false
install-microsandbox: true
test-timeout: 1200s
job-timeout-minutes: 25

- label: up-provider-microsandbox-prebuilds
runner: ubuntu-latest
free-disk-space: false
install-kind: false
requires-secret: false
install-microsandbox: true
test-timeout: 1200s
job-timeout-minutes: 25

- label: up-provider-microsandbox-dockerless
runner: ubuntu-latest
free-disk-space: false
install-kind: false
requires-secret: false
install-microsandbox: true
test-timeout: 1200s
job-timeout-minutes: 25

- label: up-provider-microsandbox-logs-cancel
runner: ubuntu-latest
free-disk-space: false
install-kind: false
requires-secret: false
install-microsandbox: true
test-timeout: 1200s
job-timeout-minutes: 25

# Snapshot tests

- label: snapshot
Expand Down Expand Up @@ -1035,37 +1110,6 @@ jobs:
--crun-path /usr/local/bin/crun \
--bootstrap-timeout 270s

- name: cache microsandbox release bundle (Linux)
if: matrix.install-microsandbox == true && runner.os == 'Linux'
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: ${{ runner.temp }}/microsandbox-linux-x86_64-v0.7.7.tar.gz
key: ${{ runner.os }}-${{ runner.arch }}-microsandbox-bundle-v0.7.7

- name: install checksum-pinned microsandbox (Linux)
if: matrix.install-microsandbox == true && runner.os == 'Linux'
timeout-minutes: 5
run: |
archive="${RUNNER_TEMP}/microsandbox-linux-x86_64-v0.7.7.tar.gz"
if [ ! -f "$archive" ]; then
curl -fsSL --retry 3 -o "$archive" \
https://github.com/superradcompany/microsandbox/releases/download/v0.7.7/microsandbox-linux-x86_64.tar.gz
fi
echo "b3cc4a5e3f52dfdd938a6f67ac4a9a959ddfe304bab56de4964044b8613f01bb $archive" | sha256sum -c -
staging="$(mktemp -d)"
trap 'rm -rf "$staging"' EXIT
tar -xzf "$archive" -C "$staging"
mkdir -p "$HOME/.microsandbox/bin" "$HOME/.microsandbox/lib" "$HOME/.local/bin"
install -m 755 "$staging/msb" "$HOME/.microsandbox/bin/msb"
install -m 644 "$staging/libkrunfw.so.5.6.1" "$HOME/.microsandbox/lib/"
ln -sf libkrunfw.so.5.6.1 "$HOME/.microsandbox/lib/libkrunfw.so.5"
ln -sf libkrunfw.so.5 "$HOME/.microsandbox/lib/libkrunfw.so"
ln -sf "$HOME/.microsandbox/bin/msb" "$HOME/.local/bin/msb"
echo "$HOME/.local/bin" >> "$GITHUB_PATH"
"$HOME/.local/bin/msb" --version
sudo test -r /dev/kvm
sudo test -w /dev/kvm

- name: remove docker
if: matrix.label == 'docker-install' && (matrix.requires-secret == false || needs.can-read-secret.outputs.secret-set == 'true')
run: |
Expand Down Expand Up @@ -1151,7 +1195,6 @@ jobs:
GH_CREDENTIAL_USERNAME: x-access-token
TEST_TIMEOUT: ${{ matrix.test-timeout || '1500s' }}
FLAKE_ATTEMPTS: ${{ matrix.flake-attempts || '1' }}
DEVSY_REQUIRE_MICROSANDBOX: ${{ matrix.install-microsandbox == true && 'true' || 'false' }}
run: |
if [ "${{ runner.os }}" == "Linux" ]; then
if [ "${{ matrix.install-podman || '' }}" = "rootless" ]; then
Expand All @@ -1168,7 +1211,6 @@ jobs:
./e2e.test -test.v -ginkgo.v -test.timeout "${TEST_TIMEOUT}" -ginkgo.fail-on-empty -ginkgo.flake-attempts="${FLAKE_ATTEMPTS}" --ginkgo.label-filter="${{ matrix.label }}"
else
sudo \
DEVSY_REQUIRE_MICROSANDBOX="${DEVSY_REQUIRE_MICROSANDBOX}" \
GH_USERNAME="${GH_USERNAME}" \
GH_ACCESS_TOKEN="${GH_ACCESS_TOKEN}" \
GH_CREDENTIAL_USERNAME="${GH_CREDENTIAL_USERNAME}" \
Expand Down Expand Up @@ -1205,6 +1247,7 @@ jobs:
- build-cli
- integration-tests-unprivileged
- integration-tests
- integration-tests-microsandbox
steps:
- name: Check required jobs
run: |
Expand Down Expand Up @@ -1241,5 +1284,6 @@ jobs:
check_result "build-cli" "${{ needs.build-cli.result }}" true || status=1
check_result "integration-tests-unprivileged" "${{ needs.integration-tests-unprivileged.result }}" true || status=1
check_result "integration-tests" "${{ needs.integration-tests.result }}" true || status=1
check_result "integration-tests-microsandbox" "${{ needs.integration-tests-microsandbox.result }}" true || status=1

exit "$status"
2 changes: 1 addition & 1 deletion THIRD_PARTY_LICENSES.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ To regenerate this file after changing dependencies, run `task cli:licenses`.
| [github.com/devsy-org/agentapi](https://github.com/devsy-org/agentapi) | `v1.0.1` | MPL-2.0 |
| [github.com/devsy-org/api](https://github.com/devsy-org/api) | `v1.1.0` | MPL-2.0 |
| [github.com/devsy-org/apiserver](https://github.com/devsy-org/apiserver) | `v1.5.4` | Apache-2.0 |
| [github.com/devsy-org/devsy-runtime-sdk](https://github.com/devsy-org/devsy-runtime-sdk) | `v1.5.2` | MPL-2.0 |
| [github.com/devsy-org/devsy-runtime-sdk](https://github.com/devsy-org/devsy-runtime-sdk) | `v1.6.0` | MPL-2.0 |
| [github.com/devsy-org/ssh](https://github.com/devsy-org/ssh) | `v1.2.9` | BSD-3-Clause |
| [github.com/distribution/reference](https://github.com/distribution/reference) | `v0.6.0` | Apache-2.0 |
| [github.com/docker/cli](https://github.com/docker/cli) | `v29.8.0+incompatible` | Apache-2.0 |
Expand Down
Loading
Loading