Skip to content

[24.0 backport] hack/make.ps1: Fix go list pattern#47266

Merged
thaJeztah merged 1 commit intomoby:24.0from
vvoland:ci-fix-makeps1-templatefail-24
Jan 31, 2024
Merged

[24.0 backport] hack/make.ps1: Fix go list pattern#47266
thaJeztah merged 1 commit intomoby:24.0from
vvoland:ci-fix-makeps1-templatefail-24

Conversation

@vvoland
Copy link
Copy Markdown
Contributor

@vvoland vvoland commented Jan 31, 2024

The double quotes inside a single quoted string don't need to be escaped.
Looks like different Powershell versions are treating this differently and it started failing unexpectedly without any changes on our side.

Signed-off-by: Paweł Gronowski [email protected]
(cherry picked from commit ecb217c)

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

The double quotes inside a single quoted string don't need to be
escaped.
Looks like different Powershell versions are treating this differently
and it started failing unexpectedly without any changes on our side.

Signed-off-by: Paweł Gronowski <[email protected]>
(cherry picked from commit ecb217c)
Signed-off-by: Paweł Gronowski <[email protected]>
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@vvoland
Copy link
Copy Markdown
Contributor Author

vvoland commented Jan 31, 2024

Known flaky:

 ___________________ SwarmTest.test_init_swarm_with_ca_config ___________________
docker/api/client.py:265: in _raise_for_status
    response.raise_for_status()
/usr/local/lib/python3.12/site-packages/requests/models.py:1021: in raise_for_status
    raise HTTPError(http_error_msg, response=self)
E   requests.exceptions.HTTPError: 503 Server Error: Service Unavailable for url: http+docker://localhost/v1.43/swarm/init

The above exception was the direct cause of the following exception:
tests/integration/api_swarm_test.py:89: in test_init_swarm_with_ca_config
    assert self.init_swarm(swarm_spec=spec)
tests/integration/base.py:126: in init_swarm
    return self._init_swarm(self.client, **kwargs)
tests/integration/base.py:93: in _init_swarm
    return client.init_swarm(
docker/utils/decorators.py:32: in wrapper
    return f(self, *args, **kwargs)
docker/api/swarm.py:181: in init_swarm
    return self._result(response, json=True)
docker/api/client.py:271: in _result
    self._raise_for_status(response)
docker/api/client.py:267: in _raise_for_status
    raise create_api_error_from_http_exception(e) from e
docker/errors.py:39: in create_api_error_from_http_exception
    raise cls(e, response=response, explanation=explanation) from e
E   docker.errors.APIError: 503 Server Error for http+docker://localhost/v1.43/swarm/init: Service Unavailable ("Swarm is encrypted and needs to be unlocked before it can be used. Please use "docker swarm unlock" to unlock it.")

@vvoland vvoland marked this pull request as ready for review January 31, 2024 19:58
@vvoland vvoland requested a review from tianon as a code owner January 31, 2024 19:58
@thaJeztah
Copy link
Copy Markdown
Member

All green now 👍

@thaJeztah thaJeztah merged commit 141ad39 into moby:24.0 Jan 31, 2024
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.

2 participants