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.

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

Map tcp,udp to udp,tcp during migration. (#6827) #6855

Merged
merged 2 commits into from Apr 2, 2019

Conversation

jeschkies
Copy link
Contributor

Summary:
Marathon 1.4 would accept tcp,udp as a protocol in Docker port
mappings. However, that value is illegal. It breaks migrations to 1.5
and up. This patch will fix the migration.

Forward port of #6827.

JIRA issues: MARATHON-8575

Summary:
Marathon 1.4 would accept `tcp,udp` as a protocol in Docker port
mappings. However, that value is illegal. It breaks migrations to 1.5
and up. This patch will fix the migration.

JIRA issues: MARATHON-8575
Copy link
Collaborator

@mesosphere-ci mesosphere-ci left a comment

Choose a reason for hiding this comment

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

I'm building your change at jenkins-marathon-pipelines-PR-6855-1.

Copy link
Collaborator

@mesosphere-ci mesosphere-ci left a comment

Choose a reason for hiding this comment

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

✗ Build of #6855 failed.

See the logs and test results for details.

Error message:

Stage Compile and Test failed.

(๑′°︿°๑)

Copy link
Collaborator

@mesosphere-ci mesosphere-ci left a comment

Choose a reason for hiding this comment

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

I'm building your change at jenkins-marathon-pipelines-PR-6855-2.

Copy link
Collaborator

@mesosphere-ci mesosphere-ci left a comment

Choose a reason for hiding this comment

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

✔ Build of #6855 completed successfully.

See details at jenkins-marathon-pipelines-PR-6855-2.

You can create a DC/OS with your patched Marathon by creating a new pull
request with the following changes in buildinfo.json:

"url": "https://s3.amazonaws.com/downloads.mesosphere.io/marathon/builds/1.7.213-c318814e9/marathon-1.7.213-c318814e9.tgz",
"sha1": "3dca6b952baa2dbf1f0c8eaaaef12f3cf05591ce"

You can run system integration test changes of this PR against Marathon master:

The job will report back to this PR.

\\ ٩( ᐛ )و //

@timcharper timcharper merged commit eb05681 into releases/1.7 Apr 2, 2019
@timcharper timcharper deleted the karsten/backport/1.7/MARATHON-8575 branch December 13, 2019 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants