Skip to content

Conversation

@alpar-t
Copy link
Contributor

@alpar-t alpar-t commented Dec 17, 2018

The build hash for this version is longer,

Closes #36414

@alpar-t alpar-t requested a review from jasontedor December 17, 2018 13:12
@alpar-t alpar-t added >non-issue :Delivery/Build Build or test infrastructure v7.0.0 labels Dec 17, 2018
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra

Copy link
Member

@jasontedor jasontedor left a comment

Choose a reason for hiding this comment

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

I left a couple of comments.

}

protected static void checkDockerVersionRecent(String dockerVersion) {
final Matcher matcher = dockerVersion =~ /Docker version (\d+\.\d+)\.\d+(?:-ce)?, build [0-9a-f]{7,}/
Copy link
Member

Choose a reason for hiding this comment

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

Since this is a SHA-1 hash, it can go up to 40 characters, so can we restrict this to {7,40}?

}

@Test(expected = GradleException.class)
public void checkDockerVersionRecentOl() {
Copy link
Member

Choose a reason for hiding this comment

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

There is a typo in the name of this test: checkDockerVersionRecentOl. I have a question about the name of the tests in general. How about testPassingDockerVersions and testFailingDockerVersions?

Copy link
Member

@jasontedor jasontedor left a comment

Choose a reason for hiding this comment

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

LGTM.

@alpar-t
Copy link
Contributor Author

alpar-t commented Dec 18, 2018

@elasticmachine run gradle tests 1

@alpar-t
Copy link
Contributor Author

alpar-t commented Dec 18, 2018

@elasticmachine run gradle build tests 1

1 similar comment
@alpar-t
Copy link
Contributor Author

alpar-t commented Dec 19, 2018

@elasticmachine run gradle build tests 1

@alpar-t
Copy link
Contributor Author

alpar-t commented Dec 19, 2018

@elasticmachine run gradle build tests 1

@droberts195
Copy link

I think this should be backported to 6.x and 6.6 too, as the same problem is failing some builds on those branches? Or is there a reason why the fix would need to be different on these branches?

@droberts195 droberts195 merged commit 9f75b6e into elastic:master Dec 20, 2018
droberts195 pushed a commit that referenced this pull request Dec 20, 2018
The build hash for some Docker versions is
longer than 7 characters.

Closes #36414
droberts195 pushed a commit that referenced this pull request Dec 20, 2018
The build hash for some Docker versions is
longer than 7 characters.

Closes #36414
@alpar-t alpar-t deleted the fix-docker-sles-36414 branch November 11, 2019 09:41
@mark-vieira mark-vieira added the Team:Delivery Meta label for Delivery team label Nov 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Delivery/Build Build or test infrastructure >non-issue Team:Delivery Meta label for Delivery team v6.6.0 v6.7.0 v7.0.0-beta1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Docker images failing build

6 participants