From 326bc345e8832e0bf9f30e6d445994a11ed34c1e Mon Sep 17 00:00:00 2001 From: Pavel Abramov Date: Thu, 1 Feb 2024 09:18:16 +0100 Subject: [PATCH] Temprorary shorten test.yml workflow Signed-off-by: Pavel Abramov --- .github/actions/run-eden-test/action.yml | 20 ---- .github/actions/setup-environment/action.yml | 71 ++---------- .github/workflows/test.yml | 108 ------------------- 3 files changed, 6 insertions(+), 193 deletions(-) diff --git a/.github/actions/run-eden-test/action.yml b/.github/actions/run-eden-test/action.yml index 647ab0ce3..0b259ecd1 100644 --- a/.github/actions/run-eden-test/action.yml +++ b/.github/actions/run-eden-test/action.yml @@ -26,23 +26,3 @@ runs: tpm_enabled: ${{ inputs.tpm_enabled }} eve_image: ${{ inputs.eve_image }} eve_artifact_name: ${{ inputs.eve_artifact_name }} - - name: Run tests - run: EDEN_TEST_STOP=n ./eden test ./tests/workflow -s ${{ inputs.suite }} -v debug - shell: bash - working-directory: "./eden" - - name: Collect info - if: failure() - uses: ./eden/.github/actions/collect-info - - name: Collect logs - if: always() - uses: ./eden/.github/actions/publish-logs - with: - report_name: eden-report-${{ inputs.suite }}-tpm-${{ inputs.tpm_enabled }}-${{ inputs.file_system }} - - name: Clean up after test - if: always() - run: | - ./eden stop - make clean - docker system prune -f -a - shell: bash - working-directory: "./eden" diff --git a/.github/actions/setup-environment/action.yml b/.github/actions/setup-environment/action.yml index 6fd830bef..c380cc4f4 100644 --- a/.github/actions/setup-environment/action.yml +++ b/.github/actions/setup-environment/action.yml @@ -16,81 +16,22 @@ inputs: runs: using: 'composite' steps: - - name: Setup go - uses: actions/setup-go@v3 - with: - go-version: '1.18' - - name: Check - run: | - for addr in $(ip addr list|sed -En -e 's/.*inet ([0-9.]+).*/\1/p') - do - if echo "$addr" | grep -q -E "10.11.(12|13).[0-9]+"; then - echo "$addr overlaps with test"; exit 1 - fi - done - df -h - sudo swapoff -a - free - shell: bash - working-directory: "./eden" - - name: Install Packages - run: | - sudo add-apt-repository ppa:stefanberger/swtpm-jammy - sudo apt install -y qemu-utils qemu-system-x86 jq swtpm util-linux - shell: bash - - name: Build tests - run: | - make build-tests - shell: bash - working-directory: "./eden" - - name: Configure - run: | - ./eden config add default - if lscpu | grep -oEq "vmx|svm"; then - ./eden config set default --key=eve.accel --value=true - else - ./eden config set default --key=eve.accel --value=false - fi - ./eden config set default --key=eve.tpm --value=${{ inputs.tpm_enabled }} - ./eden config set default --key=eve.cpu --value=2 - shell: bash - working-directory: "./eden" - name: Download artifact if specified if: inputs.eve_artifact_name != '' uses: actions/download-artifact@v3 with: name: $ {{ inputs.eve_artifact_name }} path: artifacts # this is the directory where it will put the artifact, not its name + - name: list output of artifacts + run: | + ls -la artifacts + shell: bash - name: Load containers to docker if specified if: inputs.eve_artifact_name != '' run: | docker load -i artifacts/${{ inputs.eve_artifact_name }}.tar - docker image ls shell: bash - - name: Setup eve version + - name: List Docker Images run: | - image=${{ inputs.eve_image }} - if [[ -n "$image" && "$image" == *:* ]]; then - echo "Setting up eve image ${image}" - eve_pr_registry=$(echo "$image" | cut -d ':' -f 1) - eve_pr=$(echo "$image" | cut -d ':' -f 2 | cut -d "-" -f1) - ./eden config set default --key=eve.registry --value="$eve_pr_registry" - ./eden config set default --key=eve.tag --value="$eve_pr" - else - echo "Skipping setting up eve image ${image}" - fi - shell: bash - working-directory: "./eden" - - name: Setup ext4 - if: inputs.file_system == 'ext4' - run: ./eden setup -v debug - shell: bash - working-directory: "./eden" - - name: Setup zfs - if: inputs.file_system == 'zfs' - run: | - ./eden config set default --key=eve.disks --value=4 - ./eden config set default --key=eve.disk --value=4096 - ./eden setup -v debug --grub-options='set_global dom0_extra_args "$dom0_extra_args eve_install_zfs_with_raid_level "' + docker image ls shell: bash - working-directory: "./eden" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c28bd4826..6e606f013 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,10 +32,6 @@ jobs: smoke: continue-on-error: true - strategy: - matrix: - file_system: ['ext4', 'zfs'] - tpm: [true, false] name: Smoke tests needs: determine-runner runs-on: ${{ needs.determine-runner.outputs.runner }} @@ -53,107 +49,3 @@ jobs: suite: "smoke.tests.txt" eve_image: ${{ inputs.eve_image }} eve_artifact_name: ${{ inputs.eve_artifact_name }} - - networking: - name: Networking test suite - needs: [smoke, determine-runner] - runs-on: ${{ needs.determine-runner.outputs.runner }} - steps: - - name: Get code - uses: actions/checkout@v3.5.3 - with: - repository: "lf-edge/eden" - path: "./eden" - - name: Run Networking tests - uses: ./eden/.github/actions/run-eden-test - with: - file_system: "ext4" - tpm_enabled: true - suite: "networking.tests.txt" - eve_image: ${{ inputs.eve_image }} - eve_artifact_name: ${{ inputs.eve_artifact_name }} - - storage: - continue-on-error: true - strategy: - matrix: - file_system: ['ext4', 'zfs'] - name: Storage test suite - needs: [smoke, determine-runner] - runs-on: ${{ needs.determine-runner.outputs.runner }} - steps: - - name: Get code - uses: actions/checkout@v3.5.3 - with: - repository: "lf-edge/eden" - path: "./eden" - - name: Run Storage tests - uses: ./eden/.github/actions/run-eden-test - with: - file_system: ${{ matrix.file_system }} - tpm_enabled: true - suite: "storage.tests.txt" - eve_image: ${{ inputs.eve_image }} - eve_artifact_name: ${{ inputs.eve_artifact_name }} - - lpc-loc: - name: LPC LOC test suite - needs: [smoke, determine-runner] - runs-on: ${{ needs.determine-runner.outputs.runner }} - steps: - - name: Get code - uses: actions/checkout@v3.5.3 - with: - repository: "lf-edge/eden" - path: "./eden" - - name: Run LPC LOC tests - uses: ./eden/.github/actions/run-eden-test - with: - file_system: "ext4" - tpm_enabled: true - suite: "lpc-loc.tests.txt" - eve_image: ${{ inputs.eve_image }} - eve_artifact_name: ${{ inputs.eve_artifact_name }} - - eve-upgrade: - continue-on-error: true - strategy: - matrix: - file_system: ['ext4', 'zfs'] - name: EVE upgrade test suite - needs: [smoke, determine-runner] - runs-on: ${{ needs.determine-runner.outputs.runner }} - steps: - - name: Get code - uses: actions/checkout@v3.5.3 - with: - repository: "lf-edge/eden" - path: "./eden" - - name: Run EVE upgrade tests - uses: ./eden/.github/actions/run-eden-test - with: - file_system: ${{ matrix.file_system }} - tpm_enabled: true - suite: "eve-upgrade.tests.txt" - eve_image: ${{ inputs.eve_image }} - eve_artifact_name: ${{ inputs.eve_artifact_name }} - - user-apps: - name: User apps test suite - needs: [smoke, determine-runner] - runs-on: ${{ needs.determine-runner.outputs.runner }} - steps: - - name: Get code - uses: actions/checkout@v3.5.3 - with: - repository: "lf-edge/eden" - path: "./eden" - - name: Run User apps upgrade tests - uses: ./eden/.github/actions/run-eden-test - with: - file_system: "ext4" - tpm_enabled: true - suite: "user-apps.tests.txt" - eve_image: ${{ inputs.eve_image }} - eve_artifact_name: ${{ inputs.eve_artifact_name }} -