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.

Sign up for GitHub

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

Jump to bottom

Force sos dependency on an older version #3388

Merged
merged 4 commits into from
May 20, 2021
Merged

Force sos dependency on an older version #3388

merged 4 commits into from
May 20, 2021

Conversation

alexandre-allard
Copy link
Contributor

@alexandre-allard alexandre-allard commented May 18, 2021 •
edited
Loading

Component: packages

Context:
Ci builds no longer work because metalk8s-sosreport package is not compatible with latest 4.0.0 sos package

Summary:
For now, we stick to a version before 4.0.0 as it is not compatible with this one.
But, this is more a workaround to fix the CI for now as we may want to be compatible with the latest sos versions.

Acceptance criteria:
Green build

See: #3387

@alexandre-allard
packages: force sos dependency on an older version
a6978fe 
For now, we stick to a version before 4.0.0 as
it is not compatible with this one.

Refs: #3387
@alexandre-allard alexandre-allard requested a review from a team as a code owner May 18, 2021 13:31
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@alexandre-allard

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
gdemonet
gdemonet previously approved these changes May 18, 2021
View reviewed changes
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@alexandre-allard alexandre-allard force-pushed the bugfix/3387-use-older-sos-version branch from 1acbec6 to 96ab5de Compare May 19, 2021 08:10
@bert-e

This comment has been minimized.

Sign in to view
@alexandre-allard

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@bert-e

This comment has been minimized.

Sign in to view
@alexandre-allard
build,salt: allow to pass a version constraint for packages
8bfdfc7 
Instead of passing the exact version, we can now provide
a constraint (<, >, <=, >=) if we don't need a specific
version but we want to exclude some.

Refs: #3387
@alexandre-allard alexandre-allard force-pushed the bugfix/3387-use-older-sos-version branch from 96ab5de to 8bfdfc7 Compare May 19, 2021 08:53
@bert-e
Copy link
Contributor

bert-e commented May 19, 2021

History mismatch

Merge commit #96ab5de3a4fcee20637021f97501acdb776f3f7b on the integration branch
w/2.8/bugfix/3387-use-older-sos-version is merging a branch which is neither the current
branch bugfix/3387-use-older-sos-version nor the development branch
development/2.8.

It is likely due to a rebase of the branch bugfix/3387-use-older-sos-version and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

@alexandre-allard
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented May 19, 2021

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 19, 2021

Conflict

A conflict has been raised during the creation of
integration branch w/2.8/bugfix/3387-use-older-sos-version with contents from bugfix/3387-use-older-sos-version
and development/2.8.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.8/bugfix/3387-use-older-sos-version origin/development/2.8
 $ git merge origin/bugfix/3387-use-older-sos-version
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.8/bugfix/3387-use-older-sos-version

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 19, 2021

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 19, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

TeddyAndrieux
TeddyAndrieux previously approved these changes May 19, 2021
View reviewed changes
@bert-e
Copy link
Contributor

bert-e commented May 19, 2021

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.7

  • ✔️ development/2.8

  • ✔️ development/2.9

  • ✔️ development/2.10

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@alexandre-allard
tests: Raise retry for pods status
8d3648f 
Otherwise it fails on calico pod in expansion tests
@alexandre-allard
packages: Update SaltStack repository URL
807467e 
Even if the old URL still points to the new one,
we are unable to correctly fetch the GPG key if
we use the older.
@bert-e
Copy link
Contributor

bert-e commented May 20, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 20, 2021

Build failed

The build for commit did not succeed in branch w/2.8/bugfix/3387-use-older-sos-version.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 20, 2021

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.7

  • ✔️ development/2.8

  • ✔️ development/2.9

  • ✔️ development/2.10

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 20, 2021

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.7

  • ✔️ development/2.8

  • ✔️ development/2.9

  • ✔️ development/2.10

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6

Please check the status of the associated issue None.

Goodbye alexandre-allard-scality.

@bert-e bert-e merged commit 807467e into development/2.7 May 20, 2021
@bert-e bert-e deleted the bugfix/3387-use-older-sos-version branch May 20, 2021 11:20
This was linked to issues May 20, 2021
metalk8s-sosreport package is not compatible with latest sos 4.0.0+ versions #3387
Closed
Ensure downloaded repositories GPG keys are valid #3391
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TeddyAndrieux TeddyAndrieux TeddyAndrieux approved these changes

@gdemonet gdemonet gdemonet left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@alexandre-allard @bert-e @TeddyAndrieux @gdemonet