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: deprecated debian stretch specific files and scripts are removed #14020

Merged
merged 17 commits into from
Oct 4, 2022

Conversation

mpfirrmann
Copy link
Contributor

@mpfirrmann mpfirrmann commented Sep 27, 2022

Summary

The AGW VMs now run on Ubuntu 20.04 and as the last part of the migration from Debian to Ubuntu, we purge the repo for leftover files, scripts, and comments. As part of the cleanup we ...

  • removed the deprecated packer templates with libvirt as VM provider
  • removed the deprecated packer templates based on Debian "stretch"
  • removed the deprecated AWS images based on Debian "stretch"
  • removed the deprecated Ansible role stretch_snapshot
  • removed the deprecated provision_stretch.sh script
  • removed several hints and mentions of the deprecated machines
  • removed the deprecated packer templates using Ubuntu 16.04 "xenial"
  • removed the temporary packer template that mitigated a broken OVS
  • removed an incomplete packer template
  • renamed the most recent magma-dev VM template: magma-focal-virtualbox.json -> magma-dev-virtualbox.json
  • removed setup.sh because all steps are included in the now used ubuntu_setup.sh
  • removed ansible_debian.sh due to its references to Ubuntu 14.04 "trusty"
  • removed the deprecated .seed file for the debian packer templates
  • removed several mentions of debian OS in Ansible roles
  • removed the unused envoy Ansible role referencing the Debian "stretch" repo of "Getenvoy.io"
  • removed the deprecated uselocalpkgrepo Ansible role
  • readability of magma-dev-virtualbox.json is improved
  • hints to "old" magma-focal are adapted

Closes #13969.

Test Plan

Smoke testing before merging:
Pack magma-dev VM locally
Full provision via Vagrant
-> see also issue/13566

  • Python unit tests
  • Build AGW
  • Run test_attach_detach and test_attach_dl_tcp_data

Additional Information

  • This change is backwards-breaking

@pull-request-size pull-request-size bot added the size/XL Denotes a Pull Request that changes 500-999 lines. label Sep 27, 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 component: agw Access gateway-related issue component: ci All updates on CI (Jenkins/CircleCi/Github Action) component: cwf labels Sep 27, 2022
@mpfirrmann mpfirrmann self-assigned this Sep 27, 2022
@mpfirrmann mpfirrmann linked an issue Sep 27, 2022 that may be closed by this pull request
3 tasks
@github-actions
Copy link
Contributor

github-actions bot commented Sep 27, 2022

feg-workflow

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

Results for commit f2cb7f0.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 27, 2022

dp-workflow

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

Results for commit f2cb7f0.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 27, 2022

cloud-workflow

1 135 tests   1 135 ✔️  2m 59s ⏱️
   365 suites         0 💤
       7 files           0

Results for commit f2cb7f0.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 27, 2022

agw-workflow

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

Results for commit f2cb7f0.

♻️ This comment has been updated with latest results.

@pull-request-size pull-request-size bot added size/XXL Denotes a Pull Request that changes 1000+ lines. and removed size/XL Denotes a Pull Request that changes 500-999 lines. labels Sep 27, 2022
@github-actions github-actions bot added the component: orc8r Orchestrator-related issue label Sep 27, 2022
@mpfirrmann
Copy link
Contributor Author

Grepping for stretch also gives me mentions in several other directories / files:

.cache/go/pkg/mod/github.com/docker/docker@v1.13.1/ ...
.cache/go/pkg/mod/google.golang.org/genproto@v.0.0.0-202108223120-3a666f561d7aa/ ...
ci-scripts/registry/aptly/deploy_image.sh
experimental/cloudstrapper/playbooks/roles/magma-agw/vars/main.yaml
hil_testing/Magma_Ansible/project/roles/upgrade-prep/tasks/main.yaml
nms/app/components/JsonEditor.tsx
lte/gateway/release/upgrade_magma.sh
lte/gateway/release/pydep
lte/gateway/release/deb_dependencies.bzl

I'm not quite sure what can be touched without breaking anything.

@mpfirrmann mpfirrmann changed the title [WIP] chore: deprecated debian stretch specific files and scripts are removed chore: deprecated debian stretch specific files and scripts are removed Sep 30, 2022
@mpfirrmann mpfirrmann marked this pull request as ready for review September 30, 2022 08:12
@mpfirrmann mpfirrmann requested a review from a team September 30, 2022 08:12
@mpfirrmann mpfirrmann requested a review from a team as a code owner September 30, 2022 08:12
"scripts/ubuntu_setup.sh",
"scripts/vagrant_key.sh"
],
"type": "shell"
Copy link
Contributor

Choose a reason for hiding this comment

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

nitpick: I find the old ordering that was based on semantics easier to understand than the new alphabetical ordering.

For example a provisioning step is easier to read for me if type comes first, followed by the most important argument to that type, like inline or script. Same for other items in the JSON hierarchy like the builders where I would also prefer having the type at the top, or having the post-processors after the provisioners which sort of reflects the order in which things are done.

Sticking to the old ordering has the additional advantage of making this diff much nicer to read ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Adapted. While we only renamed the .json here, I agree that a semantic ordering improves readability and leads to an easier understanding.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks! And yes, I actually read the diff wrong because of the rename ;)

@mpfirrmann mpfirrmann removed the DONOTLAND Please don't merge this label Oct 4, 2022
@mpfirrmann mpfirrmann enabled auto-merge (squash) October 4, 2022 15:37
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
@mpfirrmann mpfirrmann enabled auto-merge (squash) October 4, 2022 15:39
@mpfirrmann mpfirrmann enabled auto-merge (squash) October 4, 2022 16:07
@mpfirrmann mpfirrmann merged commit 79a196a into magma:master Oct 4, 2022
pruthvihebbani pushed a commit to pruthvihebbani/magma that referenced this pull request Oct 10, 2022
…ed (magma#14020)

* chore: deprecated packer templates for libvirt images are removed

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: deprecated packer images for debian machines are removed

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: deprecated aws images using debian are removed

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: deprecated `stretch_snapshot` ansible role is removed

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: deprecated `provision_stretch.sh` file is removed

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: several deprecated debian hints are removed

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: packer templates for Ubuntu 16.04 xenial are removed

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: temprary packer template for broken OVS are removed

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: incomplete packer template is removed

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: packer script for magma-dev vm is renamed

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: `setup.sh` since all steps are included in `ubuntu_setup.sh`

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: next batch of debian scripts are removed

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: hints to debian OS are removed from Ansible roles

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: unused `envoy` Ansible role is removed

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: deprecated `uselocalpkgrepo` Ansible role is removed

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: readabilty of `magma-dev-virtualbox.json` is improved

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

* chore: hints to old `magma_dev_focal` are adapted

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>

Signed-off-by: Marco Pfirrmann <marco.pfirrmann@tngtech.com>
@mpfirrmann mpfirrmann deleted the pr/clean_up_packer branch October 14, 2022 06:48
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) component: cwf component: orc8r Orchestrator-related issue size/XXL Denotes a Pull Request that changes 1000+ lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Assorted packer and dev-vm cleanups
7 participants