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

Update Erlang Deps (rebar3) #2289

Merged
merged 1 commit into from
Apr 7, 2021
Merged

Update Erlang Deps (rebar3) #2289

merged 1 commit into from
Apr 7, 2021

Conversation

lbakerchef
Copy link
Contributor

@lbakerchef lbakerchef commented Mar 5, 2021 •
edited

Tests

https://buildkite.com/chef/chef-chef-server-master-verify/builds/3574
https://buildkite.com/chef/chef-chef-server-master-omnibus-adhoc/builds/2315
https://buildkite.com/chef/chef-umbrella-master-chef-server/builds/320
https://buildkite.com/chef/chef-chef-server-master-verify/builds/3712
https://buildkite.com/chef/chef-chef-server-master-omnibus-adhoc/builds/2410
https://buildkite.com/chef/chef-umbrella-master-chef-server/builds/346#07fd3280-0fdb-4a06-aa36-52e9ec8bfe60

Related PRs

chef/chef_secrets#62
chef/sqerl#112
chef/ej#1

Current Status

After making changes discussed with @PrajaktaPurohit (see conversation below for context), there were failures on verify and adhoc pipelines. As such, four new branches were created, each reverting a particular change that was made. Each new branch was run through verify and adhoc tests:

lbaker/update-rebars-bifrost-revert-ej
https://buildkite.com/chef/chef-chef-server-master-verify/builds/3688
https://buildkite.com/chef/chef-chef-server-master-omnibus-adhoc/builds/2390

lbaker/update-rebars-bifrost-revert-sqerl
https://buildkite.com/chef/chef-chef-server-master-verify/builds/3689
https://buildkite.com/chef/chef-chef-server-master-omnibus-adhoc/builds/2391

lbaker/update-rebars-bifrost-revert-secrets
https://buildkite.com/chef/chef-chef-server-master-verify/builds/3690

lbaker/update-rebars-bifrost-revert-ibrowse
https://buildkite.com/chef/chef-chef-server-master-verify/builds/3691
https://buildkite.com/chef/chef-chef-server-master-omnibus-adhoc/builds/2393

The branch which reverted the ibrowse changes passed verify and adhoc tests. That branch was subsequently run through umbrella. While there were some failures, an examination revealed that the same failures were also on master:

https://buildkite.com/chef/chef-umbrella-master-chef-server/builds/339
https://buildkite.com/chef/chef-umbrella-master-chef-server/builds/340

Options:

  1. Merge the passing branch reverting ibrowse changes: lbaker/update-rebars-bifrost-revert-ibrowse
  2. Investigate why pointing to chef/ibrowse causes failures.
  3. Other.

Check List

@lbakerchef lbakerchef self-assigned this Mar 5, 2021
@lbakerchef lbakerchef requested review from a team as code owners March 5, 2021 12:18
@netlify
Copy link

netlify bot commented Mar 5, 2021 •
edited

Deploy preview for chef-server processing.

Building with commit 39910e4

https://app.netlify.com/sites/chef-server/deploys/606df4135367720007b59e94

marcparadise
marcparadise requested changes Mar 5, 2021
View reviewed changes
Copy link
Member

@marcparadise marcparadise left a comment

Choose a reason for hiding this comment

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

Could you track down which dep is pulling in pooler from seth/pooler and see if it's something we can fix? It doesn't seem to be a top-level dep. Details inline.

src/oc_bifrost/rebar.lock Outdated Show resolved Hide resolved
@lbakerchef lbakerchef force-pushed the lbaker/update-rebars-bifrost branch 3 times, most recently from e22bcc8 to a3ae2d6 Compare March 9, 2021 17:52
@PrajaktaPurohit
Copy link
Contributor

should all the other erlang deps be updated at the same time, preferably?

@lbakerchef
Copy link
Contributor Author

@PrajaktaPurohit Whatever you and @marcparadise think is best. The other erlang deps are requiring more, and ongoing work, so it may be a while. What are the pros/cons for doing it piecemeal vs all at once?

@PrajaktaPurohit
Copy link
Contributor

Let us keep all of the rebar.config updates in sync.

@lbakerchef
Copy link
Contributor Author

Roger that.

@tas50 tas50 changed the title Update bifrost dependencies. Update bifrost dependencies & other erlang deps Mar 11, 2021
@lbakerchef lbakerchef changed the title Update bifrost dependencies & other erlang deps Update Erlang Deps (rebar3) Mar 15, 2021
@lbakerchef lbakerchef force-pushed the lbaker/update-rebars-bifrost branch 6 times, most recently from e8f7e69 to 00d561b Compare March 16, 2021 18:46
@lbakerchef lbakerchef mentioned this pull request Mar 23, 2021
Merged
7 tasks
@lbakerchef lbakerchef mentioned this pull request Mar 24, 2021
Open
10 tasks
@lbakerchef
Copy link
Contributor Author

@PrajaktaPurohit I re-pointed references here to chef-secrets and ej back to master in anticipation of those repos being fixed-up and merged.

PrajaktaPurohit
PrajaktaPurohit reviewed Apr 1, 2021
View reviewed changes
src/bookshelf/rebar.lock
@@ -6,7 +6,7 @@
0},
{<<"chef_secrets">>,
{git,"git://github.com/chef/chef_secrets.git",
{ref,"58373899212a23e4f37070aaa6d3a751b1281492"}},
{branch,"master"}},
0},
Copy link
Contributor

Choose a reason for hiding this comment

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

looks like ibrowse in ➜ chef-server git:(master) ✗ ack "ibrowse.git"
src/bookshelf/rebar.lock
42: {git,"git://github.com/cmullaparthi/ibrowse.git",
points to the upstream, I think this can be changed to chef/ibrowse:chef-server branch once we figure out what brings this in.

Copy link
Contributor

Choose a reason for hiding this comment

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

chef/mini_s3@9899ce8 - let a create an issue to check that this has indeed been resolved.

Copy link
Contributor Author

@lbakerchef lbakerchef Apr 5, 2021 •
edited

Choose a reason for hiding this comment

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

Apparently mini_s3 uses cmullaparthi/ibrowse.
Additional investigation revealed that the upcoming sigv4 work does not appear to reference ibrowse (in mini_s3).
PROPOSED RESOLUTION: Do nothing with mini_s3. Merge of sigv4 should resolve the issue.

@lbakerchef
Copy link
Contributor Author

lbakerchef commented Apr 2, 2021 •
edited

Code reviewed this with @PrajaktaPurohit. Pursuant to that, I created this outline of what needs to be done.

SQERL
       A.  branch lbaker/envy standardizes usage of deps to markan/envy vs manderson26/envy.
            RESOLUTION:  don’t use this branch - make an issue to fork mark’s repo.
            https://github.com/chef/chef-server/issues/2388
       B.  there was a different branch and pr to use chef/pooler vs seth/pooler.
             this was merged already.
            RESOLUTION:  point chef-server to use sqerl/master
       C.  chef-server pins to very old commits of sqerl.
             RESOLUTION:  update the locks to point to latest sqerl master.
2.  CHEF_SECRETS
     A.  chef_secrets/lbaker/ej and PR 62 use chef/ej, not seth/ej.
           this chef_secrets PR/branch hasn’t been merged yet; there is an issue with expediter on chef_secrets repo.
           RESOLUTION:  point chef-server to chef_secrets/lbaker/ej for now; create an issue for chef_secrets expediter.
           https://github.com/chef/chef_secrets/issues/64
3.  IBROWSE
     A.  some references point to cmullaparthi.
          RESOLUTION: use chef/ibrowse (fork of cmullaparthi).  it has some fixes to some transient issues seen in the pipelines.
         create an issue to update our fork of cmullaparthi, as it is behind the upstream repo.
         [I had no authority to create this issue]
4.  EJ
     A chef/ej PR was merged with fixes for erlang19.
     RESOLUTION: Point chef-server to latest chef/ej master.
5.  MINI_S3 REPO
     Apparently mini_s3 uses cmullaparthi/ibrowse.
     Additional investigation revealed that the upcoming sigv4 work does not appear to reference ibrowse.
     PROPOSED RESOLUTION: do nothing.

@lbakerchef lbakerchef force-pushed the lbaker/update-rebars-bifrost branch 2 times, most recently from ef7f66c to 8302cfb Compare April 2, 2021 07:06
@lbakerchef lbakerchef changed the title Update Erlang Deps (rebar3) WIP Update Erlang Deps (rebar3) Apr 5, 2021
PrajaktaPurohit
PrajaktaPurohit reviewed Apr 5, 2021
View reviewed changes
src/bookshelf/rebar.config Show resolved Hide resolved
src/bookshelf/rebar.lock Outdated Show resolved Hide resolved
src/bookshelf/rebar.lock Outdated Show resolved Hide resolved
src/oc_erchef/rebar.config Outdated Show resolved Hide resolved
src/oc_erchef/rebar.lock Outdated Show resolved Hide resolved
src/oc_erchef/rebar.lock Outdated Show resolved Hide resolved
@lbakerchef lbakerchef force-pushed the lbaker/update-rebars-bifrost branch 2 times, most recently from e860ead to 328f7a0 Compare April 7, 2021 10:13
PrajaktaPurohit
PrajaktaPurohit approved these changes Apr 7, 2021
View reviewed changes
Copy link
Contributor

@PrajaktaPurohit PrajaktaPurohit left a comment

Choose a reason for hiding this comment

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

Feel free to squash and merge if the latest adhoc and umbrella builds have passed.

@lbakerchef lbakerchef force-pushed the lbaker/update-rebars-bifrost branch from 328f7a0 to b36993e Compare April 7, 2021 17:29
@lbakerchef
Update erlang dependencies.
39910e4 
Signed-off-by: Lincoln Baker <lbaker@chef.io>
@lbakerchef lbakerchef force-pushed the lbaker/update-rebars-bifrost branch from b36993e to 39910e4 Compare April 7, 2021 18:04
@lbakerchef lbakerchef merged commit 457bf34 into master Apr 7, 2021
@lbakerchef lbakerchef deleted the lbaker/update-rebars-bifrost branch April 7, 2021 18:41
@lbakerchef lbakerchef changed the title WIP Update Erlang Deps (rebar3) Update Erlang Deps (rebar3) Apr 8, 2021
@lbakerchef lbakerchef mentioned this pull request Apr 13, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marcparadise marcparadise marcparadise approved these changes

@PrajaktaPurohit PrajaktaPurohit PrajaktaPurohit approved these changes

Assignees

@lbakerchef lbakerchef

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@lbakerchef @PrajaktaPurohit @marcparadise