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: bazel base uses same folly version as magma vm #13743

Merged
merged 1 commit into from
Aug 26, 2022

Conversation

nstng
Copy link
Contributor

@nstng nstng commented Aug 25, 2022

Signed-off-by: Nils Semmelrock nils.semmelrock@tngtech.com

Summary

Note: this change was reverted in #13753 - this will be redone and needs a more sophisticated release strategy

This change makes the bazel base container use the same folly version as the magma vm. If this is not the case then sessiond builds can not run the respective other environment.

Also did small changes I will add as comments in the code here.

This change must not be merged until the updated folly debian file in #13741 is uploaded to focal-ci. [edit] done

  • can be checked the (currently red) job "Build Docker image for Bazel Base and DevContainer" on this PR.

Test Plan

  • Build and run bazel base
    • docker build -f .devcontainer/bazel-base/Dockerfile -t bb:latest .
    • docker run -v ${MAGMA_ROOT}:/workspaces/magma/ -v ${MAGMA_ROOT}/lte/gateway/configs:/etc/magma/ -it bb:latest /bin/bash
    • make sure bazel sessiond build works and runs also in the vm
    • make sure bazel build still works (tested with bazel test ...)

Additional Information

  • This change is backwards-breaking

@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines. label Aug 25, 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
Copy link
Contributor

github-actions bot commented Aug 25, 2022

dp-workflow

0 tests   0 ✔️  0s ⏱️
0 suites  0 💤
0 files    0

Results for commit b88e31d.

♻️ This comment has been updated with latest results.

# setup magma artifactories and install magma dependencies
RUN wget -qO - https://artifactory.magmacore.org:443/artifactory/api/gpg/key/public | apt-key add - && \
add-apt-repository 'deb https://artifactory.magmacore.org/artifactory/debian-test focal-ci main' && \
add-apt-repository 'deb https://artifactory.magmacore.org/artifactory/debian-test focal-1.7.0 main' && \
Copy link
Contributor Author

@nstng nstng Aug 25, 2022

Choose a reason for hiding this comment

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

This must have been forgotten - just does not make sense and is not needed.

apt-get update -y && \
apt-get install -y --no-install-recommends \
bcc-tools \
libfolly-dev \
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the replacement for the manual fmt and folly build above.

@nstng nstng mentioned this pull request Aug 25, 2022
3 tasks
Signed-off-by: Nils Semmelrock <nils.semmelrock@tngtech.com>
@nstng nstng force-pushed the bazel_base_uses_same_folly_as_vm branch from 564215a to b88e31d Compare August 25, 2022 19:00
@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines. and removed size/S Denotes a PR that changes 10-29 lines. labels Aug 25, 2022
@nstng nstng requested a review from a team August 25, 2022 19:09
@github-actions github-actions bot added the component: ci All updates on CI (Jenkins/CircleCi/Github Action) label Aug 25, 2022
@nstng nstng force-pushed the bazel_base_uses_same_folly_as_vm branch from e39b24f to b88e31d Compare August 25, 2022 19:10
@nstng nstng removed the request for review from a team August 25, 2022 19:11
Copy link
Contributor

@LKreutzer LKreutzer left a comment

Choose a reason for hiding this comment

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

Tested locally.
With the artifact from the old container I get a

/sessiond: error while loading shared libraries: libfolly.so.0.58.0-dev: cannot open shared object file: No such file or directory

And with the new container it is running.

bazel test ... is passing in the new container.

@nstng nstng merged commit d08d78f into magma:master Aug 26, 2022
nstng added a commit to nstng/magma that referenced this pull request Aug 26, 2022
)"

This reverts commit d08d78f.

Signed-off-by: Nils Semmelrock <nils.semmelrock@tngtech.com>
maxhbr pushed a commit that referenced this pull request Aug 26, 2022
…#13753)

This reverts commit d08d78f.

Signed-off-by: Nils Semmelrock <nils.semmelrock@tngtech.com>

Signed-off-by: Nils Semmelrock <nils.semmelrock@tngtech.com>
rsarwad pushed a commit to rsarwad/magma that referenced this pull request Sep 4, 2022
Signed-off-by: Nils Semmelrock <nils.semmelrock@tngtech.com>

Signed-off-by: Nils Semmelrock <nils.semmelrock@tngtech.com>
rsarwad pushed a commit to rsarwad/magma that referenced this pull request Sep 4, 2022
)" (magma#13753)

This reverts commit d08d78f.

Signed-off-by: Nils Semmelrock <nils.semmelrock@tngtech.com>

Signed-off-by: Nils Semmelrock <nils.semmelrock@tngtech.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component: ci All updates on CI (Jenkins/CircleCi/Github Action) size/M Denotes a PR that changes 30-99 lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants