Skip to content

Commit 7fb8107

Browse files
authored
Build fix (#125)
* docs: tweaking customization text * build: allow default quay_organization
1 parent e09cb98 commit 7fb8107

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.github/workflows/release.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
11+
- name: Set QUAY Organization
12+
id: quay-organization
13+
run: echo "::set-output name=name::$( [ -z '${{ secrets.quay_organization }}' ] && echo 'rhoas' || echo '${{ secrets.quay_organization }}')"
1114
- uses: actions/checkout@v2
1215
- name: Bump version
13-
run: 'FORCE_VERSION=${GITHUB_REF##*/} olm/autoupdate.sh ${{ secrets.quay_robotaccount }} ${{ secrets.quay_robottoken }} ${{ secrets.quay_organization }}'
16+
run: 'FORCE_VERSION=${GITHUB_REF##*/} olm/autoupdate.sh ${{ secrets.quay_robotaccount }} ${{ secrets.quay_robottoken }} ${{ steps.quay-organization.outputs.name }}'
1417
- name: Load version number
1518
id: version-number
1619
run: echo "::set-output name=version::$(cat olm/version)"
@@ -29,19 +32,19 @@ jobs:
2932
with:
3033
java-version: 11
3134
- name: Build and run Unit tests
32-
run: mvn install --file pom.xml --no-transfer-progress -Dquarkus.container-image.username=${{ secrets.quay_robotaccount }} -Dquarkus.container-image.password=${{ secrets.quay_robottoken }} -Dquarkus.container-image.build=true -Dquarkus.container-image.tag=${{ steps.version-number.outputs.version }} -Dquarkus.container-image.push=true -Dquarkus.container-image.username=${{ secrets.quay_robotaccount}} -Dquarkus.container-image.password=${{ secrets.quay_robottoken}} -Dquarkus.container-image.group=${{ secrets.quay_organization }}
35+
run: mvn install --file pom.xml --no-transfer-progress -Dquarkus.container-image.username=${{ secrets.quay_robotaccount }} -Dquarkus.container-image.password=${{ secrets.quay_robottoken }} -Dquarkus.container-image.build=true -Dquarkus.container-image.tag=${{ steps.version-number.outputs.version }} -Dquarkus.container-image.push=true -Dquarkus.container-image.username=${{ secrets.quay_robotaccount}} -Dquarkus.container-image.password=${{ secrets.quay_robottoken}} -Dquarkus.container-image.group=${{ steps.quay-organization.outputs.name }}
3336
- name: Build and push
3437
uses: docker/build-push-action@v2
3538
with:
3639
context: olm
3740
file: ./olm/index.Dockerfile
3841
platforms: linux/amd64
3942
push: true
40-
tags: quay.io/${{ secrets.quay_organization }}/service-operator-registry:autolatest
43+
tags: quay.io/${{ steps.quay-organization.outputs.name }}/service-operator-registry:autolatest
4144
build-args: |
4245
QUAY_USER=${{ secrets.quay_robotaccount }}
4346
QUAY_PASSWORD=${{ secrets.quay_robottoken }}
44-
QUAY_ORGANIZATION=${{ secrets.quay_organization }}
47+
QUAY_ORGANIZATION=${{ steps.quay-organization.outputs.name }}
4548
VERSION=${{ steps.version-number.outputs.version }}
4649
4750

build_docs/release.adoc

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ The link:https://github.com/bf2fc6cc711aee1a0c2a/operator/blob/main/olm/index.Do
1717

1818
== Customizing the release
1919

20-
You can set the `QUAY_ORGANIZATION` variable in github secrets. This will define where to publish and what to tag your containers as. Edit `catalogsource.yaml` to use the new bundle repository.
20+
You can set the `QUAY_ORGANIZATION` variable in github secrets. This will define where to publish and what to tag your containers as. Edit `catalogsource.yaml` to use the new bundle repository. Within this organization, you need to create three repositories `service-operator-bundle`, `service-operator`, and `service-operator-registry`. These repositories will need a user with read and write permissions, and this user will be used by the GitHub action and authenticate with the `QUAY_ROBOTTOKEN` and `QUAY_ROBOTACCOUNT` secrets.
21+
2122

2223
=== OLM Directory Structure
2324

0 commit comments

Comments
 (0)