Build fix (#125)

* docs: tweaking customization text * build: allow default quay_organization
redhat-developer · Mar 11, 2021 · 7fb8107 · 7fb8107
1 parent e09cb98
commit 7fb8107
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,9 +8,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+    - name: Set QUAY Organization
+      id: quay-organization
+      run: echo "::set-output name=name::$( [ -z '${{ secrets.quay_organization }}' ] && echo 'rhoas' || echo '${{ secrets.quay_organization }}')"    
     - uses: actions/checkout@v2
     - name: Bump version
-      run: 'FORCE_VERSION=${GITHUB_REF##*/} olm/autoupdate.sh ${{ secrets.quay_robotaccount }} ${{ secrets.quay_robottoken }} ${{ secrets.quay_organization }}'
+      run: 'FORCE_VERSION=${GITHUB_REF##*/} olm/autoupdate.sh ${{ secrets.quay_robotaccount }} ${{ secrets.quay_robottoken }} ${{ steps.quay-organization.outputs.name }}'
     - name: Load version number
       id: version-number
       run: echo "::set-output name=version::$(cat olm/version)"
@@ -29,19 +32,19 @@ jobs:
       with:
         java-version: 11
     - name: Build and run Unit tests
-      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 }}
+      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 }}
     - name: Build and push
       uses: docker/build-push-action@v2
       with:
         context: olm
         file: ./olm/index.Dockerfile
         platforms: linux/amd64
         push: true
-        tags: quay.io/${{ secrets.quay_organization }}/service-operator-registry:autolatest
+        tags: quay.io/${{ steps.quay-organization.outputs.name }}/service-operator-registry:autolatest
         build-args: |
             QUAY_USER=${{ secrets.quay_robotaccount }}
             QUAY_PASSWORD=${{ secrets.quay_robottoken }}
-            QUAY_ORGANIZATION=${{ secrets.quay_organization }}
+            QUAY_ORGANIZATION=${{ steps.quay-organization.outputs.name }}
             VERSION=${{ steps.version-number.outputs.version }}
             
       

diff --git a/build_docs/release.adoc b/build_docs/release.adoc
@@ -17,7 +17,8 @@ The link:https://github.com/bf2fc6cc711aee1a0c2a/operator/blob/main/olm/index.Do
 
 == Customizing the release
 
-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. 
+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.
+
 
 === OLM Directory Structure