[flatpak-indexer] Run the correct command

The flatpak-indexer-build needs to run only pytest as done in upstream.
Otherwise it fails on missing commands.

Signed-off-by: Michal Konecny <mkonecny@redhat.com>

roles/openshift-apps/flatpak-indexer/files/imagestream.yml

@@ -51,7 +51,7 @@ spec:
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
-  name: ubi9-python-39
+  name: ubi9-python-312
 spec:
   lookupPolicy:
     local: false
@@ -59,7 +59,7 @@ spec:
   - name: latest
     from:
       kind: DockerImage
-      name: registry.access.redhat.com/ubi9/python-39:latest
+      name: registry.access.redhat.com/ubi9/python-312:latest
     importPolicy:
       scheduled: true
     referencePolicy:

roles/openshift-apps/flatpak-indexer/templates/buildconfig.yml.j2

@@ -12,16 +12,24 @@ spec:
       name: flatpak-indexer-tardiff:latest
   runPolicy: Serial
   source:
-    contextDir: differ
+    dockerfile: |-
+      FROM registry.access.redhat.com/ubi9/go-toolset
+
+      USER root
+      RUN yum -y install time && yum clean all
+      ADD tar-diff /tmp/src
+      RUN chown -R 1001:0 /tmp/src
+
+      USER 1001
+
+      # We need to pass -buildvcs=false because we only copy part of the git checkout
+      RUN cd /tmp/src && go build -buildvcs=false -o /opt/app-root/tar-diff ./cmd/tar-diff
     git:
-      uri: https://github.com/yselkowitz/flatpak-indexer.git
+      uri: https://github.com/owtaylor/flatpak-indexer.git
       ref: "{{ flatpak_indexer_git_ref }}"
     type: Git
   strategy:
     dockerStrategy:
-      from:
-        kind: ImageStreamTag
-        name: ubi9-go-toolset:latest
       noCache: true
     type: Docker
   triggers:
@@ -43,6 +51,7 @@ spec:
   postCommit:
     command:
     - tools/test.sh
+    - "--pytest"
   runPolicy: Serial
   source:
     images:
@@ -55,7 +64,7 @@ spec:
       - destinationDir: bin
         sourcePath: /usr/bin/time
     git:
-      uri: https://github.com/yselkowitz/flatpak-indexer.git
+      uri: https://github.com/owtaylor/flatpak-indexer.git
       ref: "{{ flatpak_indexer_git_ref }}"
     type: Git
   strategy:
@@ -65,7 +74,7 @@ spec:
         value: "1"
       from:
         kind: ImageStreamTag
-        name: ubi9-python-39:latest
+        name: ubi9-python-312:latest
     type: Source
   triggers:
   - type: ConfigChange
@@ -92,8 +101,9 @@ spec:
   source:
     contextDir: redis
     git:
-      uri: https://github.com/yselkowitz/flatpak-indexer.git
-      ref: "{{ flatpak_indexer_git_ref }}"
+      # This is only temporary till https://github.com/owtaylor/flatpak-indexer/pull/28 is merged
+      uri: https://github.com/zlopez/flatpak-indexer.git
+      ref: "fix_indexer"
     type: Git
   strategy:
     dockerStrategy:

roles/openshift-apps/flatpak-indexer/templates/deploymentconfig.yml.j2

@@ -28,6 +28,8 @@ spec:
     spec:
       containers:
       - env:
+        - name: OUTPUT_DIR
+          value: /var/www/flatpaks
         - name: REDIS_PASSWORD
           valueFrom:
             secretKeyRef:
@@ -106,6 +108,8 @@ spec:
     spec:
       containers:
       - env:
+        - name: OUTPUT_DIR
+          value: /var/www/flatpaks
         - name: FLATPAK_INDEXER_COMMAND
           value: differ
         - name: REDIS_PASSWORD
@@ -188,7 +192,7 @@ spec:
         image: redis:latest
         livenessProbe:
           exec:
-            command: ['redis-cli', 'ping']
+            command: ['valkey-cli', '-a', '$REDIS_PASSWORD', 'ping']
           failureThreshold: 3
           initialDelaySeconds: 15
           periodSeconds: 10
@@ -200,7 +204,7 @@ spec:
           protocol: TCP
         readinessProbe:
           exec:
-            command: ['redis-cli', 'ping']
+            command: ['valkey-cli', '-a', '$REDIS_PASSWORD', 'ping']
           failureThreshold: 3
           periodSeconds: 60
           successThreshold: 1
@@ -264,6 +268,8 @@ spec:
               key: password
         - name: REDIS_URL
           value: redis://redis.flatpak-indexer.svc.cluster.local:6379
+        - name: OUTPUT_DIR
+          value: /var/www/flatpaks
         image: flatpak-indexer:latest
         name: flatpak-indexer
         ports:
@@ -335,6 +341,8 @@ spec:
     spec:
       containers:
       - env:
+        - name: OUTPUT_DIR
+          value: /var/www/flatpaks
         - name: FLATPAK_INDEXER_COMMAND
           value: differ
         - name: REDIS_PASSWORD

roles/openshift-apps/flatpak-indexer/vars/production.yml

@@ -1,2 +1,2 @@
 ---
-flatpak_indexer_git_ref: production
+flatpak_indexer_git_ref: main

roles/openshift-apps/flatpak-indexer/vars/staging.yml

@@ -1,2 +1,2 @@
 ---
-flatpak_indexer_git_ref: staging
+flatpak_indexer_git_ref: main