Skip to content

CI: get rid of duplicates in e2e jobs #1248

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
Merged
merged 1 commit into from
Nov 18, 2022
Merged

CI: get rid of duplicates in e2e jobs #1248

merged 1 commit into from
Nov 18, 2022

Conversation

@bart0sh
Copy link
Member

@bart0sh bart0sh commented Nov 16, 2022

Fixes: #1136

@bart0sh bart0sh force-pushed the PR152-ci-get-rid-of-duplicates branch 2 times, most recently from 69dc09b to 56ef29d Compare November 16, 2022 16:40
@okartau
Copy link
Contributor

okartau commented Nov 16, 2022

We get this now, thats because bmaas test stage takes make target directly from GH job name.

make: *** No rule to make target 'e2e'.  Stop.

@okartau
Copy link
Contributor

okartau commented Nov 16, 2022

aha, I see thats planned to get set via:
jobname: e2e-dsa
but, does it work?

@bart0sh bart0sh force-pushed the PR152-ci-get-rid-of-duplicates branch 7 times, most recently from 8c126be to f715416 Compare November 16, 2022 18:15
@bart0sh bart0sh requested a review from okartau November 16, 2022 20:36
mythi
mythi reviewed Nov 17, 2022
View reviewed changes
.github/workflows/e2e.yml
name: ${{ matrix.name }}
runs-on: ${{ matrix.runner }}
env:
TARGET_JOB: ${{ matrix.targetjob || matrix.name }}
Copy link
Contributor

@mythi mythi Nov 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could we speed up things if we move to a model where several targets are run on the same runner:

    strategy:
      fail-fast: true
      matrix:
        runner: [fpga, gpu, qat, sgx, simics-gnr, simics-spr]
        include:
          - runner: fpga
            target: e2e-fpga
          - runner: gpu
            target: e2e-gpu
          - runner: qat
            target: e2e-qat
          - runner: sgx
            target: e2e-sgx
          - runner: simics-gnr
            target: e2e-dlb e2e-dsa e2e-iaa
          - runner: simics-spr
            target: e2e-dlb e2e-dsa e2e-iaa e2e-qat4

Copy link
Member Author

@bart0sh bart0sh Nov 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you mean one after another, without re-provisioning?

Copy link
Contributor

@mythi mythi Nov 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes: make e2e-dlb e2e-dsa e2e-iaa

Copy link
Member Author

@bart0sh bart0sh Nov 17, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would be against our CI design - to test changes in a clean environment.
However, having an additional test that runs multiple workloads sequentially could be a good idea.

mythi
mythi reviewed Nov 17, 2022
View reviewed changes
@okartau
Copy link
Contributor

okartau commented Nov 17, 2022

Backend change for this is on dev.env, using backward-compatible solution: use TARGET_JOB if defined or GITHUB_JOB.
This is trace with current PR change:

Check JOB variables: GITHUB_JOB:[e2e] TARGET_JOB:[e2e-dsa]
use value of TARGET_JOB as make target:e2e-dsa

This is trace without current PR change:

Check JOB variables: GITHUB_JOB:[e2e-iaa] TARGET_JOB:[undef]
use value of GITHUB_JOB as make target:e2e-iaa

@bart0sh bart0sh changed the title WIP: CI: get rid of duplicates in e2e jobs CI: get rid of duplicates in e2e jobs Nov 17, 2022
@bart0sh bart0sh marked this pull request as ready for review November 17, 2022 10:52
@bart0sh bart0sh requested a review from kad as a code owner November 17, 2022 10:52
@okartau
Copy link
Contributor

okartau commented Nov 17, 2022 •
edited by bart0sh
Loading

I don't get it why this still fails in iaa/GNR, despite few reruns after iaa timeout fix was merged. Isn't it rebased automatically ?

@okartau it's not. PR authors have to rebase their PR manually, I believe.

@bart0sh bart0sh force-pushed the PR152-ci-get-rid-of-duplicates branch from f715416 to 891d6ad Compare November 17, 2022 18:35
mythi
mythi previously approved these changes Nov 17, 2022
View reviewed changes
@mythi
Copy link
Contributor

mythi commented Nov 17, 2022

@bart0sh please rebase and add the operator image to iaa/dsa targets

@bart0sh bart0sh force-pushed the PR152-ci-get-rid-of-duplicates branch from 891d6ad to 99594a3 Compare November 17, 2022 20:51
@bart0sh
Copy link
Member Author

bart0sh commented Nov 17, 2022

@bart0sh please rebase and add the operator image to iaa/dsa targets

done

@mythi mythi merged commit d96d22c into intel:main Nov 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mythi mythi mythi approved these changes

@okartau okartau Awaiting requested review from okartau

@kad kad Awaiting requested review from kad kad is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Get rid of duplicates in e2e jobs

3 participants

@bart0sh @okartau @mythi