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

Run skopeo via docker in integration test jobs #8355

Merged
merged 4 commits into from
Jun 12, 2024
Merged

Conversation

pstibrany
Copy link
Member

@pstibrany pstibrany commented Jun 12, 2024

What this PR does

We run integration tests on ubuntu-latest runner, without using build-image. Current ubuntu-latest is ubuntu-22.04, and it has old skopeo version 1.4.1. Even newer (in beta) ubuntu-24.04 still has skopeo version 1.13.3.

Since we need to use skopeo 1.14.2 or later to work with Docker 1.25, we try to run it via docker.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
aknuds1
aknuds1 previously approved these changes Jun 12, 2024
Copy link
Contributor

@aknuds1 aknuds1 left a comment

Choose a reason for hiding this comment

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

Looks like a good fix to me. Oops too fast, it doesn't quite work :D

@aknuds1 aknuds1 dismissed their stale review June 12, 2024 14:01

Doesn't quite work yet.

@aknuds1 aknuds1 self-requested a review June 12, 2024 14:01
Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
@pstibrany pstibrany marked this pull request as ready for review June 12, 2024 14:20
@pstibrany pstibrany requested a review from a team as a code owner June 12, 2024 14:20
Copy link
Contributor

@duricanikolic duricanikolic left a comment

Choose a reason for hiding this comment

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

LGTM

@pstibrany pstibrany merged commit 24ae27e into main Jun 12, 2024
29 checks passed
@pstibrany pstibrany deleted the run-skopeo-via-docker branch June 12, 2024 14:35
grafanabot pushed a commit that referenced this pull request Jun 12, 2024
* run skopeo via docker in integration tests.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Use fixed version.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add /tmp volume and path to docker.sock.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Only map /tmp/images.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit 24ae27e)
duricanikolic pushed a commit that referenced this pull request Jun 12, 2024
* run skopeo via docker in integration tests.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Use fixed version.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add /tmp volume and path to docker.sock.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Only map /tmp/images.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit 24ae27e)

Co-authored-by: Peter Štibraný <pstibrany@gmail.com>
grafanabot pushed a commit that referenced this pull request Jun 13, 2024
* run skopeo via docker in integration tests.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Use fixed version.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add /tmp volume and path to docker.sock.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Only map /tmp/images.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit 24ae27e)
pstibrany added a commit that referenced this pull request Jun 13, 2024
* run skopeo via docker in integration tests.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Use fixed version.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add /tmp volume and path to docker.sock.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Only map /tmp/images.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit 24ae27e)

Co-authored-by: Peter Štibraný <pstibrany@gmail.com>
ying-jeanne pushed a commit that referenced this pull request Jun 13, 2024
* run skopeo via docker in integration tests.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Use fixed version.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add /tmp volume and path to docker.sock.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Only map /tmp/images.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit 24ae27e)

Co-authored-by: Peter Štibraný <pstibrany@gmail.com>
@ying-jeanne
Copy link
Contributor

just noticed latest 2 minor versions are also broken because of skopeo version too old, backport to release 2.12

@grafanabot
Copy link
Contributor

The backport to release-2.12 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-8355-to-release-2.12 origin/release-2.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 24ae27e41b91f2091f2f6c11744d407ad80ab663
# Push it to GitHub
git push --set-upstream origin backport-8355-to-release-2.12
git switch main
# Remove the local backport branch
git branch -D backport-8355-to-release-2.12

Then, create a pull request where the base branch is release-2.12 and the compare/head branch is backport-8355-to-release-2.12.

ying-jeanne pushed a commit that referenced this pull request Jun 27, 2024
* run skopeo via docker in integration tests.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Use fixed version.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add /tmp volume and path to docker.sock.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Only map /tmp/images.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit 24ae27e)
ying-jeanne pushed a commit that referenced this pull request Jun 27, 2024
…TY] (release-2.12) (#8536)

* chore(deps): update module github.com/hashicorp/go-retryablehttp to v0.7.7 [security]

* Run `skopeo` via docker in integration test jobs (#8355)

* run skopeo via docker in integration tests.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Use fixed version.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add /tmp volume and path to docker.sock.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Only map /tmp/images.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit 24ae27e)

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Peter Štibraný <pstibrany@gmail.com>
ying-jeanne pushed a commit that referenced this pull request Jun 28, 2024
* run skopeo via docker in integration tests.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Use fixed version.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add /tmp volume and path to docker.sock.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Only map /tmp/images.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit 24ae27e)
(cherry picked from commit 27751d5)
ying-jeanne pushed a commit that referenced this pull request Jun 28, 2024
* run skopeo via docker in integration tests.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Use fixed version.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add /tmp volume and path to docker.sock.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Only map /tmp/images.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit 24ae27e)
(cherry picked from commit 27751d5)
ying-jeanne pushed a commit that referenced this pull request Jun 28, 2024
* run skopeo via docker in integration tests.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Use fixed version.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add /tmp volume and path to docker.sock.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Only map /tmp/images.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit 24ae27e)
(cherry picked from commit 27751d5)
ying-jeanne pushed a commit that referenced this pull request Jun 28, 2024
…TY] (release-2.11) (#8537)

* chore(deps): update module github.com/hashicorp/go-retryablehttp to v0.7.7 [security]

* Use `grafana/doc-validator:v5.1.0` (#8002)

It's a version tagged at the same commit as the existing short SHA.

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 70fa416)

* Run `skopeo` via docker in integration test jobs (#8355)

* run skopeo via docker in integration tests.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Use fixed version.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add /tmp volume and path to docker.sock.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Only map /tmp/images.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit 24ae27e)
(cherry picked from commit 27751d5)

* Initialize Tanka with 1.29. (#7544)

* Initialize Tanka with 1.29.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Update other refs.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit f62476c)

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Peter Štibraný <pstibrany@gmail.com>
@grafanabot
Copy link
Contributor

The backport to mimir-distributed-release-5.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-8355-to-mimir-distributed-release-5.3 origin/mimir-distributed-release-5.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 24ae27e41b91f2091f2f6c11744d407ad80ab663
# Push it to GitHub
git push --set-upstream origin backport-8355-to-mimir-distributed-release-5.3
git switch main
# Remove the local backport branch
git branch -D backport-8355-to-mimir-distributed-release-5.3

Then, create a pull request where the base branch is mimir-distributed-release-5.3 and the compare/head branch is backport-8355-to-mimir-distributed-release-5.3.

jhesketh pushed a commit to jhesketh/mimir that referenced this pull request Sep 6, 2024
* run skopeo via docker in integration tests.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Use fixed version.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add /tmp volume and path to docker.sock.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Only map /tmp/images.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit 24ae27e)
jhesketh added a commit that referenced this pull request Sep 6, 2024
* run skopeo via docker in integration tests.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Use fixed version.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add /tmp volume and path to docker.sock.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Only map /tmp/images.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit 24ae27e)

Co-authored-by: Peter Štibraný <pstibrany@gmail.com>
jhesketh added a commit that referenced this pull request Sep 10, 2024
* Run `skopeo` via docker in integration test jobs (#8355) (#9216)

* run skopeo via docker in integration tests.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Use fixed version.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add /tmp volume and path to docker.sock.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Only map /tmp/images.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
(cherry picked from commit 24ae27e)

Co-authored-by: Peter Štibraný <pstibrany@gmail.com>

* [Helm] Release 5.3.1 (#9215)

* [Helm] Release 5.3.1

* Update release-notes

* Fix docs

---------

Co-authored-by: Peter Štibraný <pstibrany@gmail.com>
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.

6 participants