Skip to content

Bump ci containers (bp #1002) - #1012

Merged
D4N merged 2 commits into
0.27-maintenancefrom
mergify/bp/0.27-maintenance/pr-1002
Oct 1, 2019
Merged

Bump ci containers (bp #1002)#1012
D4N merged 2 commits into
0.27-maintenancefrom
mergify/bp/0.27-maintenance/pr-1002

Conversation

@mergify

@mergify mergify Bot commented Sep 30, 2019

Copy link
Copy Markdown
Contributor

This is an automated backport of pull request #1002 done by Mergify.io

Cherry-pick of dc338f9 has failed:

On branch mergify/bp/0.27-maintenance/pr-1002
Your branch is up to date with 'origin/0.27-maintenance'.

You are currently cherry-picking commit dc338f934.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   .gitlab-ci.yml
	both modified:   ci/install_dependencies.sh
	both modified:   contrib/vms/Vagrantfile

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of e22c97e has failed:

On branch mergify/bp/0.27-maintenance/pr-1002
Your branch is ahead of 'origin/0.27-maintenance' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e22c97e1c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   ci/install_dependencies.sh

no changes added to commit (use "git add" and/or "git commit -a")

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

@D4N
D4N force-pushed the mergify/bp/0.27-maintenance/pr-1002 branch from b57cb4c to 95d8aac Compare September 30, 2019 14:55
@codecov

codecov Bot commented Oct 1, 2019

Copy link
Copy Markdown

Codecov Report

Merging #1012 into 0.27-maintenance will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@                Coverage Diff                @@
##           0.27-maintenance    #1012   +/-   ##
=================================================
  Coverage             63.36%   63.36%           
=================================================
  Files                   158      158           
  Lines                 21730    21730           
=================================================
  Hits                  13769    13769           
  Misses                 7961     7961

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 ee31327...78fc0dc. Read the comment docs.

@D4N
D4N force-pushed the mergify/bp/0.27-maintenance/pr-1002 branch from 8c57ce3 to f6f91d1 Compare October 1, 2019 20:22
D4N
D4N previously approved these changes Oct 1, 2019
D4N added 2 commits October 1, 2019 23:39
CentOS recently started to provide python3 by default obsoleted python36. Our
manual hack broke the test suite and is no longer required.

(cherry picked from commit e22c97e)
@D4N
D4N force-pushed the mergify/bp/0.27-maintenance/pr-1002 branch from f6f91d1 to 78fc0dc Compare October 1, 2019 21:39
@mergify
mergify Bot dismissed D4N’s stale review October 1, 2019 21:40

Pull request has been modified.

@D4N
D4N merged commit a30027c into 0.27-maintenance Oct 1, 2019
@mergify
mergify Bot deleted the mergify/bp/0.27-maintenance/pr-1002 branch October 1, 2019 22:40
@kevinbackhouse kevinbackhouse added this to the v0.27.3 milestone Nov 4, 2023
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