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

Improve iso-manager script error handling #3081

Merged
merged 9 commits into from
Feb 12, 2021
Merged

Improve iso-manager script error handling #3081

merged 9 commits into from
Feb 12, 2021

Conversation

alexandre-allard
Copy link
Contributor

@alexandre-allard alexandre-allard commented Feb 3, 2021 •
edited
Loading

Component: scripts

Context:

Summary:

Acceptance criteria:

Closes: #3079
Closes: #2862

@alexandre-allard alexandre-allard requested a review from a team as a code owner February 3, 2021 12:16
@bert-e
Copy link
Contributor

bert-e commented Feb 3, 2021

Hello alexandre-allard-scality,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Feb 3, 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:

@alexandre-allard alexandre-allard force-pushed the bugfix/3079-iso-manager-improve-error-message branch from 7eb8d98 to bbab3b7 Compare February 3, 2021 12:37
TeddyAndrieux
TeddyAndrieux reviewed Feb 3, 2021
View reviewed changes
scripts/iso-manager.sh Outdated Show resolved Hide resolved
scripts/iso-manager.sh Outdated Show resolved Hide resolved
@alexandre-allard alexandre-allard force-pushed the bugfix/3079-iso-manager-improve-error-message branch 2 times, most recently from 63c1e73 to 2687613 Compare February 3, 2021 14:28
TeddyAndrieux
TeddyAndrieux reviewed Feb 3, 2021
View reviewed changes
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux left a comment

Choose a reason for hiding this comment

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

Few comments otherwise LGTM (just unit tests are missing + likely a changelog entry)

salt/_modules/metalk8s.py Outdated Show resolved Hide resolved
salt/_modules/metalk8s.py Outdated Show resolved Hide resolved
salt/_modules/metalk8s.py Outdated Show resolved Hide resolved
salt/_modules/metalk8s.py Outdated Show resolved Hide resolved
@alexandre-allard alexandre-allard force-pushed the bugfix/3079-iso-manager-improve-error-message branch 2 times, most recently from 1322825 to a6a3d97 Compare February 5, 2021 10:57
TeddyAndrieux
TeddyAndrieux previously approved these changes Feb 5, 2021
View reviewed changes
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux left a comment

Choose a reason for hiding this comment

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

LGTM

@alexandre-allard
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Feb 8, 2021

Branches have diverged

This pull request's source branch bugfix/3079-iso-manager-improve-error-message has diverged from
development/2.8 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

  • Merge origin/development/2.8 into bugfix/3079-iso-manager-improve-error-message
  • Rebase bugfix/3079-iso-manager-improve-error-message onto origin/development/2.8

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

The following options are set: approve

@alexandre-allard alexandre-allard force-pushed the bugfix/3079-iso-manager-improve-error-message branch from a6a3d97 to a3a7a12 Compare February 8, 2021 08:40
@bert-e
Copy link
Contributor

bert-e commented Feb 8, 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

@alexandre-allard
scripts: get archive absolute path
8dc71ca 
We need the absolute path to put it in the
bootstrap.yaml configuration file, otherwise
Salt will not be able to retrieve the archive
when called.
@alexandre-allard
scripts: use common library functions
e13099a 
Instead of redeclaring some functions, use
the common.sh library
@alexandre-allard alexandre-allard force-pushed the bugfix/3079-iso-manager-improve-error-message branch 2 times, most recently from 0155327 to 31ca2f2 Compare February 10, 2021 18:01
@alexandre-allard alexandre-allard force-pushed the bugfix/3079-iso-manager-improve-error-message branch from 31ca2f2 to 0ac0634 Compare February 11, 2021 08:48
@bert-e
Copy link
Contributor

bert-e commented Feb 12, 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.8

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7

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 Feb 12, 2021

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

  • ✔️ development/2.8

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7

Please check the status of the associated issue None.

Goodbye alexandre-allard-scality.

@bert-e bert-e merged commit c7a5793 into development/2.8 Feb 12, 2021
@bert-e bert-e deleted the bugfix/3079-iso-manager-improve-error-message branch February 12, 2021 14:51
@alexandre-allard alexandre-allard mentioned this pull request Mar 15, 2021
Closed
@alexandre-allard alexandre-allard linked an issue Mar 15, 2021 that may be closed by this pull request
iso-manager script should build and store metalk8s.iso absolute path in bootstrap.yaml file #3082
Closed
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

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