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

chore(agw): remove docker-compose.dev.file #14050

Merged
merged 3 commits into from
Oct 12, 2022

Conversation

crasu
Copy link
Contributor

@crasu crasu commented Sep 30, 2022

Summary

The docker-compose.dev.file is redundant. This pr removes it.

Test Plan

  • Run attach test with and without dev mode. Checked that it failed without dev mode. (retested ater rebase on okt 11)
  • Checked if the env variable is set correctly

@crasu crasu requested a review from a team September 30, 2022 13:19
@crasu crasu requested a review from a team as a code owner September 30, 2022 13:19
@crasu crasu requested a review from Neudrino September 30, 2022 13:19
@pull-request-size pull-request-size bot added the size/L Denotes a Pull Request that changes 100-499 lines. label Sep 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

@github-actions github-actions bot added the component: ci All updates on CI (Jenkins/CircleCi/Github Action) label Sep 30, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Sep 30, 2022

feg-workflow

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

Results for commit 211bc8e.

♻️ This comment has been updated with latest results.

@sebathomas
Copy link
Contributor

sebathomas commented Sep 30, 2022

Did you test the case of a production setup? I guess the variable is not set and then it just works and it's also not set in the containers?

Edit: Discussed in person that it works if the variable is not set.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 30, 2022

dp-workflow

14 tests   14 ✔️  2m 32s ⏱️
  1 suites    0 💤
  1 files      0

Results for commit 211bc8e.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 30, 2022

agw-workflow

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

Results for commit 211bc8e.

♻️ This comment has been updated with latest results.

@@ -161,6 +174,8 @@ services:
retries: 3
cap_add:
- NET_RAW
environment:
MAGMA_DEV_MODE: ${MAGMA_DEV_MODE}
command: /usr/bin/env python3 -m magma.monitord.main

redirectd:
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a reason it isn't needed for redirectd?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Its probably not needed for a lot of other service as well. But I only removed it from service where I know from the top of my head it wasn't required.

Copy link
Contributor

Choose a reason for hiding this comment

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

Okay, sure. Maybe you could open an issue when this gets merged to remove any other unnecessary ones?

lte/gateway/docker/README.md Show resolved Hide resolved
lte/gateway/docker/README.md Outdated Show resolved Hide resolved
@crasu crasu added the DONOTLAND Please don't merge this label Oct 11, 2022
@crasu crasu force-pushed the pr/kill-docker-compose-dev-yaml branch from 894a1c1 to c1d4ebe Compare October 11, 2022 11:15
@crasu crasu requested a review from a team as a code owner October 11, 2022 11:15
@crasu crasu requested a review from uri200 October 11, 2022 11:15
@crasu crasu removed the DONOTLAND Please don't merge this label Oct 11, 2022
@github-actions github-actions bot added the component: agw Access gateway-related issue label Oct 11, 2022
@crasu crasu requested a review from maxhbr October 11, 2022 12:05
Christian Krämer added 3 commits October 12, 2022 08:56
Signed-off-by: Christian Krämer <christian.kraemer@tngtech.com>
…ntainerized integ tests

Signed-off-by: Christian Krämer <christian.kraemer@tngtech.com>
Signed-off-by: Christian Krämer <christian.kraemer@tngtech.com>
@crasu crasu force-pushed the pr/kill-docker-compose-dev-yaml branch from 9bdb216 to 211bc8e Compare October 12, 2022 06:58
Copy link
Member

@maxhbr maxhbr left a comment

Choose a reason for hiding this comment

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

LGTM

@crasu crasu merged commit f80ddd7 into magma:master Oct 12, 2022
Neudrino added a commit to Neudrino/magma that referenced this pull request Oct 12, 2022
Signed-off-by: Fritz Lehnert <13189449+Neudrino@users.noreply.github.com>
Neudrino added a commit that referenced this pull request Oct 12, 2022
Signed-off-by: Fritz Lehnert <13189449+Neudrino@users.noreply.github.com>
rsarwad pushed a commit to rsarwad/magma that referenced this pull request Oct 13, 2022
magma#14139)

otherwise hanging containers take up to 20s to restart and tests run
into timeouts.

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Co-authored-by: Marco Pfirrmann <christian.kraemer@tngtech.com>

Addressed review comment

Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>

feat(agw): time before killing containers during restart is reduced as (magma#14139)

otherwise hanging containers take up to 20s to restart and tests run
into timeouts.

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Co-authored-by: Marco Pfirrmann <christian.kraemer@tngtech.com>

Addressed review comment

Signed-off-by: Rashmi <rashmi.sarwad@radisys.com>

feat(agw): time before killing containers during restart is reduced as (magma#14139)

otherwise hanging containers take up to 20s to restart and tests run
into timeouts.

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Co-authored-by: Marco Pfirrmann <christian.kraemer@tngtech.com>

fix(ci): there was a bit too much deleted in magma#14050 (magma#14143)

Signed-off-by: Fritz Lehnert <13189449+Neudrino@users.noreply.github.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 component: ci All updates on CI (Jenkins/CircleCi/Github Action) size/L Denotes a Pull Request that changes 100-499 lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants