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

Swimm updates #904

Merged
merged 5 commits into from
Dec 15, 2020
Merged

Swimm updates #904

merged 5 commits into from
Dec 15, 2020

Conversation

shreyamalviya
Copy link
Contributor

@shreyamalviya shreyamalviya commented Dec 9, 2020

Fix "Implement a new PBA — ScheduleJobs" Swimm unit and modify Travis script for new Swimm version

@codecov
Copy link

codecov bot commented Dec 9, 2020

Codecov Report

Merging #904 (50bec61) into develop (f07826d) will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop     #904   +/-   ##
========================================
  Coverage    60.56%   60.57%           
========================================
  Files          166      166           
  Lines         4953     4954    +1     
========================================
+ Hits          3000     3001    +1     
  Misses        1953     1953           
Impacted Files Coverage Δ
common/utils/exceptions.py 100.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 44fd1ab...50bec61. Read the comment docs.

@shreyamalviya shreyamalviya changed the title Fix "Implement a new PBA — ScheduleJobs" Swimm unit Swimm updates Dec 9, 2020
.travis.yml Outdated
Comment on lines 57 to 58
- sudo apt-get -y install libappindicator3-1
- sudo apt-get -y install libsecret-1-0
Copy link
Contributor

Choose a reason for hiding this comment

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

sudo apt-get -f install after dpkg -i swimm should be better, as we wouldn't have to figure out dependencies each time they change

Copy link
Contributor

@VakarisZ VakarisZ left a comment

Choose a reason for hiding this comment

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

Let install dependencies dynamically. Other than that, it's hard to review the logic of swimm unit, as all the previous values were gibberish, so I trust you tested this.

.travis.yml Outdated
@@ -98,10 +98,11 @@ script:

# verify swimm
- cd $TRAVIS_BUILD_DIR
- wget https://firebasestorage.googleapis.com/v0/b/swimmio.appspot.com/o/Release%2Fv018%2Fswimm-0.1.8-linux-executable\?alt\=media\&token\=e59c0a18-577f-4b77-bb3b-91b22c3d8b2a -O swimm
- wget "https://firebasestorage.googleapis.com/v0/b/swimmio.appspot.com/o/Release%2Fv029%2FSwimm_0.2.9_Setup.deb?alt=media&token=774ebd98-cb4e-4615-900c-aada224c1608" -O swimm
- sudo dpkg -i swimm || (sudo apt-get update && sudo apt-get -f install && sudo dpkg -i swimm)
Copy link
Contributor

Choose a reason for hiding this comment

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

do we need the additional sudo dpkg -i swimm at the end? sudo apt-get -f install not enough?

Copy link
Contributor

@VakarisZ VakarisZ left a comment

Choose a reason for hiding this comment

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

Address my comment, test if needed and you can merge

@shreyamalviya shreyamalviya merged commit d1743a9 into guardicore:develop Dec 15, 2020
@shreyamalviya shreyamalviya deleted the swimm-fix branch December 23, 2020 07:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants