Authenticate QCI registry quay-proxy.ci.openshift.org (openshift-knat…

…ive#183) * Authenticate QCI registry quay-proxy.ci.openshift.org * Quote the token * Update readme with info about accessing QCI registry * Simplify readme
mgencur · Jul 16, 2024 · b3c9a8b · b3c9a8b
1 parent 1cc5787
commit b3c9a8b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/release-generate-ci-template.yaml b/.github/workflows/release-generate-ci-template.yaml
@@ -75,7 +75,11 @@ jobs:
 
       - name: Generate CI
         working-directory: ./src/github.com/openshift-knative/hack
-        run: make generate-ci-no-clean ARGS=--branch=master
+        env:
+          QCI_TOKEN: ${{ secrets.QCI_TOKEN }}
+        run: |
+          podman login -u=image-puller -p="${QCI_TOKEN}" quay-proxy.ci.openshift.org
+          make generate-ci-no-clean ARGS=--branch=master
 
       - name: Create Pull Request
         if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }}

diff --git a/.github/workflows/release-generate-ci.yaml b/.github/workflows/release-generate-ci.yaml
@@ -126,7 +126,11 @@ jobs:
           git config --global user.name "serverless-qe"
       - name: Generate CI
         working-directory: ./src/github.com/openshift-knative/hack
-        run: make generate-ci-no-clean ARGS=--branch=master
+        env:
+          QCI_TOKEN: ${{ secrets.QCI_TOKEN }}
+        run: |
+          podman login -u=image-puller -p="${QCI_TOKEN}" quay-proxy.ci.openshift.org
+          make generate-ci-no-clean ARGS=--branch=master
       - name: Create Pull Request
         if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }}
         env:

diff --git a/README.md b/README.md
@@ -10,6 +10,9 @@ CI tooling and hacks to improve CI
 - Run `make generate-ci ARGS=--remote=<your_remote>`
     - For example, `make generate-ci ARGS=--remote=git@github.com:pierDipi/release.git`
     - If you are using `podman`, make sure to have `export CONTAINER_ENGINE=podman` set
+    - Make sure podman can access QCI registry at quay-proxy.ci.openshift.org. Members of this [Rover group](https://rover.redhat.com/groups/group/openshift-serverless-admins) can authenticate in this way:
+      - Copy the login command from [app.ci](https://oauth-openshift.apps.ci.l2s4.p1.openshiftapps.com/oauth/token/request) and run it
+      - Run `podman login -u=$(oc whoami) -p=$(oc whoami -t) quay-proxy.ci.openshift.org`
 - Create a PR to [https://github.com/openshift/release](https://github.com/openshift/release) (to be
   automated)
 

diff --git a/pkg/prowgen/prowgen.go b/pkg/prowgen/prowgen.go
@@ -295,7 +295,7 @@ func copyOwnersFileIfNotPresent(dir string) error {
 }
 
 func RunOpenShiftReleaseGenerator(ctx context.Context, openShiftRelease Repository) error {
-	if _, err := run(ctx, openShiftRelease, "make", "-f", "Makefile.legacy", "ci-operator-config", "jobs"); err != nil {
+	if _, err := run(ctx, openShiftRelease, "make", "ci-operator-config", "jobs"); err != nil {
 		return err
 	}
 	return nil