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

feature: CLDSRV-278 add github action to release image for fed #4795

Merged

Conversation

miniscruff
Copy link
Contributor

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Sep 14, 2022

Hello miniscruff,

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.

@scality scality deleted a comment from bert-e Sep 14, 2022
@miniscruff miniscruff marked this pull request as ready for review September 14, 2022 21:58
@miniscruff miniscruff force-pushed the feature/CLDSRV-278/provide-image-for-federation branch from 2d32f18 to d4683c1 Compare September 14, 2022 22:12
@scality scality deleted a comment from bert-e Sep 14, 2022
@scality scality deleted a comment from bert-e Sep 14, 2022
@scality scality deleted a comment from bert-e Sep 14, 2022
@scality scality deleted a comment from bert-e Sep 14, 2022
images/svc-base/Dockerfile Show resolved Hide resolved
images/svc-base/Dockerfile Show resolved Hide resolved
Comment on lines 19 to 40
- name: Checkout
uses: actions/checkout@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Login to Registry
uses: docker/login-action@v1
with:
registry: ${{ env.REGISTRY_NAME }}
username: ${{ secrets.REGISTRY_LOGIN }}
password: ${{ secrets.REGISTRY_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@v2
with:
context: .
file: images/svc-base/Dockerfile
push: true
tags: "${{ env.REGISTRY_NAME }}/${{env.PROJECT_NAME }}/${{ env.PROJECT_NAME }}:${{ github.event.inputs.tag }}-svc-base"
cache-from: type=gha
cache-to: type=gha,mode=max

Choose a reason for hiding this comment

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

You could save most of this by using shared worfklow :
https://github.com/scality/workflows/blob/main/.github/workflows/docker-build.yaml

Then it would look something like :

  steps: 
    uses: scality/workflows/.github/workflows/docker-build.yaml@v1
    secrets: inherit
    with:
      push: true
      namespace: ${{ env.PROJECT_NAME }}
      name: ${{ env.PROJECT_NAME }}
      tag: "${{ github.event.inputs.tag }}-svc-base"
      context: images/svc-base/Dockerfile
      registry: ${{ env.REGISTRY_NAME }}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was not possible to use as the file input was not being used in that workflow, it is now so switching over.

@Emylou-s Emylou-s requested a review from tcarmet September 15, 2022 12:01
@miniscruff miniscruff force-pushed the feature/CLDSRV-278/provide-image-for-federation branch from d4683c1 to 04d13ca Compare September 15, 2022 19:23
@miniscruff miniscruff force-pushed the feature/CLDSRV-278/provide-image-for-federation branch from 04d13ca to 89843bc Compare September 15, 2022 19:26
@scality scality deleted a comment from bert-e Sep 15, 2022
@scality scality deleted a comment from bert-e Sep 15, 2022
@bert-e
Copy link
Contributor

bert-e commented Sep 15, 2022

Conflict

A conflict has been raised during the creation of
integration branch w/8.4/feature/CLDSRV-278/provide-image-for-federation with contents from w/7.70/feature/CLDSRV-278/provide-image-for-federation
and development/8.4.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.4/feature/CLDSRV-278/provide-image-for-federation origin/development/8.4
 $ git merge origin/w/7.70/feature/CLDSRV-278/provide-image-for-federation
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.4/feature/CLDSRV-278/provide-image-for-federation

@scality scality deleted a comment from bert-e Sep 15, 2022
@scality scality deleted a comment from bert-e Sep 15, 2022
@scality scality deleted a comment from bert-e Sep 15, 2022
@scality scality deleted a comment from bert-e Sep 15, 2022
@scality scality deleted a comment from bert-e Sep 15, 2022
@miniscruff miniscruff requested a review from Emylou-s September 15, 2022 19:30
@scality scality deleted a comment from bert-e Sep 15, 2022
Copy link
Contributor

@tcarmet tcarmet left a comment

Choose a reason for hiding this comment

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

I don't know if you think we should add a workflow that just build this image before merging, to ensure we're not breaking it. (I'll let you be the judge of that).

LGTM

.github/workflows/release.yaml Outdated Show resolved Hide resolved
@bert-e
Copy link
Contributor

bert-e commented Sep 19, 2022

Integration data created

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

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4

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

@bert-e
Copy link
Contributor

bert-e commented Sep 19, 2022

Waiting for approval

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

  • the author

  • 2 peers

@miniscruff
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Sep 19, 2022

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/7.10

  • ✔️ development/7.70

  • ✔️ development/8.4

  • ✔️ development/8.5

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4

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 Sep 19, 2022

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

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.4

  • ✔️ development/8.5

The following branches have NOT changed:

  • development/6.4
  • development/7.4

Please check the status of the associated issue CLDSRV-278.

Goodbye miniscruff.

@bert-e bert-e merged commit b554a7e into development/7.10 Sep 19, 2022
@bert-e bert-e deleted the feature/CLDSRV-278/provide-image-for-federation branch September 19, 2022 20:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants