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.

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

fix(ci): bump cwag images to focal and adapt package setup #12901

Merged
merged 1 commit into from
Jun 6, 2022
Merged

fix(ci): bump cwag images to focal and adapt package setup #12901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions cwf/gateway/Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.synced_folder "../..", "/home/vagrant/magma"

config.vm.define :cwag, primary: true do |cwag|
cwag.vm.box = "generic/ubuntu1804"
cwag.vm.box = "generic/ubuntu2004"
cwag.disksize.size = '50GB'
cwag.vm.box_version = "1.9.12"
cwag.vm.box_version = "4.0.2"
cwag.vbguest.auto_update = false
cwag.vm.hostname = "cwag-dev"
cwag.vm.network "private_network", ip: "192.168.70.101", nic_type: "82540EM"
Expand Down Expand Up @@ -114,8 +114,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
end

config.vm.define :cwag_test, primary: true do |cwag_test|
cwag_test.vm.box = "generic/ubuntu1804"
cwag_test.vm.box_version = "1.9.12"
cwag_test.vm.box = "generic/ubuntu2004"
cwag_test.vm.box_version = "4.0.2"
cwag_test.vm.hostname = "cwag-test"
cwag_test.vm.network "private_network", ip: "192.168.70.102", nic_type: "82540EM"
cwag_test.vm.network "private_network", ip: "192.168.40.12", nic_type: "82540EM"
Expand Down
2 changes: 1 addition & 1 deletion cwf/gateway/deploy/roles/ovs/tasks/debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
- dh-autoreconf
- libssl-dev
- libtool
- net-tools
Copy link
Contributor

@jheidbrink jheidbrink Jun 3, 2022 •
edited

Choose a reason for hiding this comment

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

just curious: how did you discover this dependency?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

net-tools contains ifconfig - ifconfig is used in one of the ansible steps

- openssl
- procps
- python-all
- python-twisted-conch
Copy link
Contributor

Choose a reason for hiding this comment

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

Did the cwf integ tests succeed with this change?

Copy link
Contributor Author

@nstng nstng Jun 3, 2022 •
edited

Choose a reason for hiding this comment

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

for now I just created the images - its on my list to try them locally (if feasible - if not, then CI might be the better choice here)

- python-zope.interface
- python-six
- build-essential
Expand Down