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

Enable grain caching and only spawn 1 node for multi-node CI stage #2417

Merged
merged 2 commits into from
Apr 16, 2020
Merged

Enable grain caching and only spawn 1 node for multi-node CI stage #2417

merged 2 commits into from
Apr 16, 2020

Conversation

TeddyAndrieux
Copy link
Collaborator

Component:

'build', 'salt'

Context:

  1. Grains compute may take time on salt-master and they are computed at each and every salt command
  2. We spawn 2 extra node in the multi-node CI stage when we only expand to the first one

Summary:

  1. Enable grains caching for salt-master
  2. Only spawn 1 extra node in the multi-node CI stage

@TeddyAndrieux
salt: Enable grains_cache on salt master
c84613f 
Some grains compute on salt-master can take time to compute and since
these grains are compute for each and every salt command, that may make
the command last longer and longer for no good reason as we do not need
to compute grains at every command
@TeddyAndrieux
eve: Only spawn 1 node for multi-nodes
0d8b76d 
Currently during multi-nodes stage we only expand to one node but
spawning 2 additionnal node, this is not needed only spawn one extra
node for expansions as we do not need more for the moment
@TeddyAndrieux TeddyAndrieux requested a review from a team April 16, 2020 14:59
@bert-e
Copy link
Contributor

bert-e commented Apr 16, 2020

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Apr 16, 2020

Conflict

A conflict has been raised during the creation of
integration branch w/2.4/bugfix/fix-salt-lags with contents from w/2.3/bugfix/fix-salt-lags
and development/2.4.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.4/bugfix/fix-salt-lags origin/development/2.4
 $ git merge origin/w/2.3/bugfix/fix-salt-lags
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.4/bugfix/fix-salt-lags

gdemonet
gdemonet approved these changes Apr 16, 2020
View reviewed changes
Copy link
Contributor

@gdemonet gdemonet left a comment

Choose a reason for hiding this comment

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

👌

@bert-e
Copy link
Contributor

bert-e commented Apr 16, 2020

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Apr 16, 2020

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Apr 16, 2020

Build failed

The build for commit did not succeed in branch w/2.5/bugfix/fix-salt-lags.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 16, 2020

Build failed

The build for commit did not succeed in branch w/2.6/bugfix/fix-salt-lags.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 16, 2020

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.0

  • ✔️ development/2.1

  • ✔️ development/2.2

  • ✔️ development/2.3

  • ✔️ development/2.4

  • ✔️ development/2.5

  • ✔️ development/2.6

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 16, 2020

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.0

  • ✔️ development/2.1

  • ✔️ development/2.2

  • ✔️ development/2.3

  • ✔️ development/2.4

  • ✔️ development/2.5

  • ✔️ development/2.6

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit d0e24a6 into development/2.0 Apr 16, 2020
@bert-e bert-e deleted the bugfix/fix-salt-lags branch April 16, 2020 17:31
@gdemonet gdemonet added this to the MetalK8s 2.4.3 milestone Apr 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdemonet gdemonet gdemonet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
MetalK8s 2.4.3
Development

Successfully merging this pull request may close these issues.
3 participants
@TeddyAndrieux @bert-e @gdemonet