Skip to content

[2.1][BACKPORT] 7491 from master: Fix tox failure by pinning pytest dependency.#7492

Merged
d2iq-mergebot merged 2 commits into
dcos:2.1from
d2iq-archive:backport/2.1/master-7491
Jul 30, 2020
Merged

[2.1][BACKPORT] 7491 from master: Fix tox failure by pinning pytest dependency.#7492
d2iq-mergebot merged 2 commits into
dcos:2.1from
d2iq-archive:backport/2.1/master-7491

Conversation

@d2iq-mergebot
Copy link
Copy Markdown
Collaborator

This is a backport of the following PR:

#7491

High-level description

Just released version of pytest 6.0.0 causes tox to failure.

This has been resolved by pytest pytest-dev/pytest#7565, however, as we wait for update, we could approach the problem at our end by pinning pytest to previous stable version.

Corresponding DC/OS tickets (required)

  • D2IQ-70503 Pin pytest to fix tox failures in DC/OS

@d2iq-mergebot
Copy link
Copy Markdown
Collaborator Author

@mesosphere-mergebot test all

@d2iq-mergebot
Copy link
Copy Markdown
Collaborator Author

Successfully triggered checks:

teamcity/dcos/build/tox
teamcity/dcos/build/dcos
teamcity/dcos/test/test-e2e/group1
teamcity/dcos/test/terraform/aws/onprem/static/group4
teamcity/dcos/test/terraform/aws/onprem/static/group1
teamcity/dcos/test/terraform/aws/onprem/static/group3
teamcity/dcos/test/terraform/aws/onprem/static/group2

@d2iq-mergebot
Copy link
Copy Markdown
Collaborator Author

@mesosphere-mergebot test all

@d2iq-mergebot
Copy link
Copy Markdown
Collaborator Author

This repo has @mesosphere-mergebot integration. You can perform the following commands by submitting a comment. Submit a comment with content "@mesosphere-mergebot help" to view more detailed help text and examples. Be sure the have a look at the mergebot documentation, too.

@mesosphere-mergebot test  
@mesosphere-mergebot request-review  
@mesosphere-mergebot override-status pr-status-check jira-url 
@mesosphere-mergebot autotrigger-tests-on-ready-for-review  
@mesosphere-mergebot merge-it  
@mesosphere-mergebot ready-for-review-label  
@mesosphere-mergebot sync  
@mesosphere-mergebot label [Ready For Review|do not merge - test|Holding|Request For Comment|dependencies|Work In Progress|merge-by-mergebot|Ship It] 
@mesosphere-mergebot autotest-on-backports-and-trains  
@mesosphere-mergebot backport  
@mesosphere-mergebot changelog-not-required reason 
@mesosphere-mergebot bump-ee  
  • PR creators can apply one of [Ready For Review|Work In Progress]. Owners can apply any label.

@d2iq-mergebot
Copy link
Copy Markdown
Collaborator Author

Successfully triggered checks:

teamcity/dcos/build/tox
teamcity/dcos/build/dcos
teamcity/dcos/test/test-e2e/group1
teamcity/dcos/test/terraform/aws/onprem/static/group4
teamcity/dcos/test/terraform/aws/onprem/static/group1
teamcity/dcos/test/terraform/aws/onprem/static/group3
teamcity/dcos/test/terraform/aws/onprem/static/group2

@d2iq-mergebot
Copy link
Copy Markdown
Collaborator Author

Enterprise Bump PR: mesosphere/dcos-enterprise/pull/8070

@d2iq-mergebot
Copy link
Copy Markdown
Collaborator Author

@mesosphere-mergebot bump-ee

@d2iq-mergebot
Copy link
Copy Markdown
Collaborator Author

Enterprise Bump mesosphere/dcos-enterprise/pull/8070 updated.

@orsenthil
Copy link
Copy Markdown
Contributor

@mesosphere-mergebot merge-it

@d2iq-mergebot
Copy link
Copy Markdown
Collaborator Author

PR Status Checks are not Green... merging anyway

Details
{'context': {'continuous-integration/jenkins/pr-head': ('success',
                                                        '2020-07-30T02:51:22Z'),
             'mergebot/changes_md': ('success', '2020-07-30T02:32:54Z'),
             'mergebot/enterprise/build-status/aggregate': ('pending',
                                                            '2020-07-30T02:58:18Z'),
             'mergebot/enterprise/changes_md': ('success',
                                                '2020-07-30T02:38:58Z'),
             'mergebot/enterprise/review/approved/min_1': ('success',
                                                           '2020-07-30T02:38:58Z'),
             'mergebot/has_ship-it': ('pending', '2020-07-30T02:32:53Z'),
             'mergebot/review/approved/min_1': ('success',
                                                '2020-07-30T02:32:54Z'),
             'teamcity/dcos/build/dcos': ('success', '2020-07-30T02:37:55Z'),
             'teamcity/dcos/build/tox': ('success', '2020-07-30T02:38:04Z'),
             'teamcity/dcos/test/terraform/aws/onprem/static/group1': ('success',
                                                                       '2020-07-30T03:05:30Z'),
             'teamcity/dcos/test/terraform/aws/onprem/static/group2': ('pending',
                                                                       '2020-07-30T02:38:52Z'),
             'teamcity/dcos/test/terraform/aws/onprem/static/group3': ('pending',
                                                                       '2020-07-30T02:38:52Z'),
             'teamcity/dcos/test/terraform/aws/onprem/static/group4': ('success',
                                                                       '2020-07-30T03:09:04Z'),
             'teamcity/dcos/test/test-e2e/group1': ('pending',
                                                    '2020-07-30T02:38:00Z')},
 'state': 'pending'}

@d2iq-mergebot d2iq-mergebot added merge-by-mergebot Used by mergebot to suppress unnecessary warnings when merging and removed Ready For Review labels Jul 30, 2020
@d2iq-mergebot
Copy link
Copy Markdown
Collaborator Author

Enterprise Bump PR mesosphere/dcos-enterprise/pull/8070, and the current PR #7492 are now merged.

@d2iq-mergebot d2iq-mergebot merged commit e56183e into dcos:2.1 Jul 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge-by-mergebot Used by mergebot to suppress unnecessary warnings when merging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants