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

images: don't use etcd3 0.11.0 in salt-master #2108

Closed
wants to merge 1 commit into from
Closed

images: don't use etcd3 0.11.0 in salt-master #2108

wants to merge 1 commit into from

Conversation

NicolasT
Copy link
Contributor

@NicolasT NicolasT commented Dec 8, 2019

Install of this version is broken (missing requirements/base.txt file used by setup.py in the package).

See: kragniz/python-etcd3#952
(cherry picked from commit 2d6af26)

@NicolasT
images: don't use etcd3 0.11.0 in salt-master
53b4d0b 
Install of this version is broken (missing `requirements/base.txt` file
used by `setup.py` in the package).

See: kragniz/python-etcd3#952
(cherry picked from commit 2d6af26)
Signed-off-by: Nicolas Trangez <ikke@nicolast.be>

Conflicts:
	images/salt-master/Dockerfile
@NicolasT NicolasT added kind:bug Something isn't working moonshot topic:build Anything related to building steps complexity:easy Something that requires less than a day to fix kind:dependencies Pull requests that update a dependency file release:blocker An issue that blocks a release until resolved priority:urgent Any issue we should jump in as soon as possible labels Dec 8, 2019
@bert-e
Copy link
Contributor

bert-e commented Dec 8, 2019

Hello nicolast,

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 Dec 8, 2019

Conflict

A conflict has been raised during the creation of
integration branch w/2.1/bugfix/python-etcd3 with contents from bugfix/python-etcd3
and development/2.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.1/bugfix/python-etcd3 origin/development/2.1
 $ git merge origin/bugfix/python-etcd3
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.1/bugfix/python-etcd3

@NicolasT
Copy link
Contributor Author

NicolasT commented Dec 8, 2019

/approve

@bert-e
Copy link
Contributor

bert-e commented Dec 8, 2019

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

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 8, 2019

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:

The following options are set: approve

@NicolasT
Copy link
Contributor Author

NicolasT commented Dec 8, 2019

Minor change in the 2.1 branch because of a small change in the Dockerfile for salt-master between 2.0 and 2.1. Other than that, CI should cover everything.

@bert-e
Copy link
Contributor

bert-e commented Dec 8, 2019

Build failed

The build for commit did not succeed in branch bugfix/python-etcd3.

The following options are set: approve

@NicolasT
Copy link
Contributor Author

Closing because there's an 0.11.1 upstream and #2103 will bring a fix at least in 2.4 and up.

@NicolasT NicolasT closed this Dec 12, 2019
@NicolasT NicolasT deleted the bugfix/python-etcd3 branch December 12, 2019 18:48
@bert-e bert-e restored the bugfix/python-etcd3 branch December 12, 2019 18:48
@NicolasT NicolasT mentioned this pull request Dec 13, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sayf-eddine-scality sayf-eddine-scality sayf-eddine-scality approved these changes

Assignees
No one assigned
Labels
complexity:easy Something that requires less than a day to fix kind:bug Something isn't working kind:dependencies Pull requests that update a dependency file priority:urgent Any issue we should jump in as soon as possible release:blocker An issue that blocks a release until resolved topic:build Anything related to building steps
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@NicolasT @bert-e @sayf-eddine-scality