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.

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

fix(ci): Fix broken feg integ tests. #13781

Merged

Conversation

crasu
Copy link
Contributor

@crasu crasu commented Aug 30, 2022

Summary

Feg integ tests need both magmad in docker for running the feg and magmad started by systemd for agw. So the detection which magmad to restart fails. We are now defaulting to systemd as it was before and we will probably have some kind of cli parameter for feg tests in the future to restart both magmads.

Test Plan

Test works on locally machine
Feg test run https://github.com/crasu/magma/actions/runs/2955993651.

@crasu crasu requested review from a team and VinashakAnkitAman August 30, 2022 11:45
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines. label Aug 30, 2022
@github-actions github-actions bot added the component: agw Access gateway-related issue label Aug 30, 2022
@github-actions
Copy link
Contributor

Thanks for opening a PR! 💯

A couple initial guidelines

Howto

  • Reviews. The "Reviewers" listed for this PR are the Magma maintainers who will shepherd it.
  • Checks. All required CI checks must pass before merge.
  • Merge. Once approved and passing CI checks, use the ready2merge label to indicate the maintainers can merge your PR.

More info

Please take a moment to read through the Magma project's

If this is your first Magma PR, also consider reading

@crasu crasu changed the title fix(ci): Fix feg integ tests. fix(ci): Fix broken feg integ tests. Aug 30, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Aug 30, 2022

Oops! Looks like you failed the Python Format Check.

Howto

♻️ Updated: ✅ The check is passing the Python Format Check after the last commit.

@github-actions
Copy link
Contributor

github-actions bot commented Aug 30, 2022

feg-workflow

    2 files  203 suites   40s ⏱️
374 tests 374 ✔️ 0 💤 0
388 runs  388 ✔️ 0 💤 0

Results for commit b5232aa.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

github-actions bot commented Aug 30, 2022

dp-workflow

14 tests   14 ✔️  3m 7s ⏱️
  1 suites    0 💤
  1 files      0

Results for commit b5232aa.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

github-actions bot commented Aug 30, 2022

agw-workflow

615 tests   611 ✔️  3m 35s ⏱️
    2 suites      4 💤
    2 files        0

Results for commit b5232aa.

♻️ This comment has been updated with latest results.

@crasu crasu force-pushed the pr/fix-feg-integ-test-after-agw-containerization branch from 9965c35 to 99d6638 Compare August 30, 2022 14:14
return InitMode.DOCKER
elif systemd_running:
return InitMode.SYSTEMD
else:
raise RuntimeError("Magmad is not running with either Docker or systemd")
return InitMode.SYSTEMD # default to systemd if both are running - needed by feg integ tests
Copy link
Contributor

Choose a reason for hiding this comment

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

Will it not just go into the docker_running branch in that case instead of defaulting to systemd? I think this branch is only reached if neither is running.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

arg

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

@crasu crasu force-pushed the pr/fix-feg-integ-test-after-agw-containerization branch from 99d6638 to e152340 Compare August 30, 2022 14:54
Copy link
Contributor

@sebathomas sebathomas left a comment

Choose a reason for hiding this comment

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

Looking good now, just some minor things.

lte/gateway/python/integ_tests/s1aptests/s1ap_utils.py Outdated Show resolved Hide resolved
lte/gateway/python/integ_tests/s1aptests/s1ap_utils.py Outdated Show resolved Hide resolved
@github-actions
Copy link
Contributor

github-actions bot commented Aug 30, 2022

Oops! Looks like you failed the DCO check. Be sure to sign all your commits.

Howto

♻️ Updated: ✅ The check is passing the DCO check after the last commit.

@crasu crasu force-pushed the pr/fix-feg-integ-test-after-agw-containerization branch from 43e5af0 to aa70046 Compare August 30, 2022 15:09
… for feg and systemd magmad for agw. So the detection fails.

Signed-off-by: Christian Krämer <christian.kraemer@tngtech.com>
@crasu crasu force-pushed the pr/fix-feg-integ-test-after-agw-containerization branch from aa70046 to b5232aa Compare August 30, 2022 15:11
@crasu
Copy link
Contributor Author

crasu commented Aug 31, 2022

@VinashakAnkitAman Could you have a look? Currently the feg integ build is red. This should fix it.

@VinashakAnkitAman
Copy link
Member

VinashakAnkitAman commented Sep 1, 2022

@VinashakAnkitAman Could you have a look? Currently the feg integ build is red. This should fix it.

Sure, I will go through the changes now.

Copy link
Member

@VinashakAnkitAman VinashakAnkitAman left a comment

Choose a reason for hiding this comment

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

LGTM

@voisey voisey merged commit 4134ee9 into magma:master Sep 2, 2022
rsarwad pushed a commit to rsarwad/magma that referenced this pull request Sep 4, 2022
… for feg and systemd magmad for agw. So the detection fails. (magma#13781)

Signed-off-by: Christian Krämer <christian.kraemer@tngtech.com>

Signed-off-by: Christian Krämer <christian.kraemer@tngtech.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component: agw Access gateway-related issue size/XS Denotes a PR that changes 0-9 lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants