ci: Update Tekton config file to use smarter matrixes.

pvital · pvital · commit 2465dec56e53 · 2025-08-18T15:44:51.000+02:00
Signed-off-by: Paulo Vital &lt;paulo.vital@ibm.com&gt;
diff --git a/.tekton/.currency/scripts/generate_report.py b/.tekton/.currency/scripts/generate_report.py
@@ -4,7 +4,6 @@
 from datetime import datetime
 
 import pandas as pd
-
 # Third Party
 import requests
 from bs4 import BeautifulSoup
@@ -188,7 +187,7 @@ def process_taskrun_logs(
                     "Successfully installed .* (google-cloud-storage-[^\s]+)", logs
                 )
                 tekton_ci_output += f"{match[1]}\n"
-            elif task_name == "python-tracer-unittest-default-task":
+            elif task_name == "python-tracer-unittest-py-version-task":
                 for line in logs.splitlines():
                     if "Successfully installed" in line:
                         tekton_ci_output += line
@@ -227,7 +226,7 @@ def get_tekton_ci_output():
         googlecloud_taskruns, core_v1_client, namespace, task_name, tekton_ci_output
     )
 
-    task_name = "python-tracer-unittest-default-task"
+    task_name = "python-tracer-unittest-py-version-task"
     taskrun_filter = (  # noqa: E731
         lambda tr: tr["metadata"]["name"].endswith("unittest-default-3")
         and tr["status"]["conditions"][0]["type"] == "Succeeded"
diff --git a/.tekton/pipeline.yaml b/.tekton/pipeline.yaml
@@ -6,6 +6,21 @@ spec:
   params:
   - name: revision
     type: string
+  - name: py-versions
+    type: array
+    default:
+      - "3.8"
+      - "3.9"
+      - "3.10"
+      - "3.11"
+      - "3.12"
+      - "3.13"
+  - name: py-version-latest
+    type: string
+    default: "3.13"
+  - name: py-version-next
+    type: string
+    default: "3.14.0b4"
   workspaces:
     - name: python-tracer-ci-pipeline-pvc
   tasks:
@@ -18,86 +33,86 @@ spec:
       workspaces:
         - name: task-pvc
           workspace: python-tracer-ci-pipeline-pvc
-    - name: unittest-default
-      displayName: "Platforms and Browsers: $(params.platform) and $(params.browser)"
+    - name: unittest-py-version
+      displayName: "Unittest for Python $(params.py-version)"
       runAfter:
         - clone
       matrix:
         params:
-          - name: imageDigest
-            value:
-              # public.ecr.aws/docker/library/python:3.8.20-bookworm
-              - "sha256:7aa279fb41dad2962d3c915aa6f6615134baa412ab5aafa9d4384dcaaa0af15d"
-              # public.ecr.aws/docker/library/python:3.9.23-bookworm
-              - "sha256:4f77eeb4a6ab4364c601f1f4bc36f10945c0c42ef092f2704e7f99cd9170333a"
-              # public.ecr.aws/docker/library/python:3.10.18-bookworm
-              - "sha256:6b942ef4c1315964c027925010da1957e540c7c103c0718e7673da807bbf206c"
-              # public.ecr.aws/docker/library/python:3.11.13-bookworm
-              - "sha256:d53da2e965e9de4f1b5424544d7bd39f776ea9b1fc745335914045b1e6628c67"
-              # public.ecr.aws/docker/library/python:3.12.11-bookworm
-              - "sha256:01b17a5e297dd60629347a17d7c27908fc2c049e81a8cea3d5a1141f38777b8f"
-              # public.ecr.aws/docker/library/python:3.13.4-bookworm
-              - "sha256:8300f4e04ed367fafc5877b39dcf7a205532e295778f6fd20a08e1652b177d7b"
-              # public.ecr.aws/docker/library/python:3.14.0b1-bookworm
-              - "sha256:ce2af63139630eac65e3b9dba09c5083b199d692511eb1749192f25ac11abb93"
+          - name: py-version
+            value: $(params.py-versions)
       taskRef:
-        name: python-tracer-unittest-default-task
+        name: python-tracer-unittest-py-version-task
       workspaces:
         - name: task-pvc
           workspace: python-tracer-ci-pipeline-pvc
     - name: unittest-cassandra
+      displayName: "Unittest for Cassandra with Python $(params.py-version)"
       runAfter:
         - clone
       matrix:
         params:
-          - name: imageDigest
+          - name: py-version
             value:
-              # public.ecr.aws/docker/library/python:3.9.23-bookworm
-              - "sha256:4f77eeb4a6ab4364c601f1f4bc36f10945c0c42ef092f2704e7f99cd9170333a"
+              - $(params.py-version-latest)
       taskRef:
         name: python-tracer-unittest-cassandra-task
       workspaces:
         - name: task-pvc
           workspace: python-tracer-ci-pipeline-pvc
     - name: unittest-gevent-starlette
+      displayName: "Unittest for Gevent and Starlette with Python $(params.py-version)"
       runAfter:
         - clone
       matrix:
         params:
-          - name: imageDigest
+          - name: py-version
             value:
-              # public.ecr.aws/docker/library/python:3.9.23-bookworm
-              - "sha256:4f77eeb4a6ab4364c601f1f4bc36f10945c0c42ef092f2704e7f99cd9170333a"
+              - $(params.py-version-latest)
       taskRef:
         name: python-tracer-unittest-gevent-starlette-task
       workspaces:
         - name: task-pvc
           workspace: python-tracer-ci-pipeline-pvc
     - name: unittest-aws
+      displayName: "Unittest for AWS with Python $(params.py-version)"
       runAfter:
         - clone
       matrix:
         params:
-          - name: imageDigest
+          - name: py-version
             value:
-              # public.ecr.aws/docker/library/python:3.12.11-bookworm
-              - "sha256:01b17a5e297dd60629347a17d7c27908fc2c049e81a8cea3d5a1141f38777b8f"
+              - $(params.py-version-latest)
       taskRef:
         name: python-tracer-unittest-aws-task
       workspaces:
         - name: task-pvc
           workspace: python-tracer-ci-pipeline-pvc
     - name: unittest-kafka
+      displayName: "Unittest for Kafka with Python $(params.py-version)"
       runAfter:
         - clone
       matrix:
         params:
-          - name: imageDigest
+          - name: py-version
             value:
-              # public.ecr.aws/docker/library/python:3.12.11-bookworm
-              - "sha256:01b17a5e297dd60629347a17d7c27908fc2c049e81a8cea3d5a1141f38777b8f"
+              - $(params.py-version-latest)
       taskRef:
         name: python-tracer-unittest-kafka-task
       workspaces:
         - name: task-pvc
           workspace: python-tracer-ci-pipeline-pvc
+    - name: unittest-python-next
+      displayName: "Unittest for next Python $(params.py-version)"
+      runAfter:
+        - clone
+      matrix:
+        params:
+          - name: py-version
+            value:
+              - $(params.py-version-next)
+      taskRef:
+        name: python-tracer-unittest-python-next-task
+      workspaces:
+        - name: task-pvc
+          workspace: python-tracer-ci-pipeline-pvc
diff --git a/.tekton/task.yaml b/.tekton/task.yaml
@@ -12,8 +12,7 @@ spec:
       mountPath: /workspace
   steps:
     - name: clone
-      # public.ecr.aws/docker/library/alpine:3.20.3
-      image: public.ecr.aws/docker/library/alpine@sha256:029a752048e32e843bd6defe3841186fb8d19a28dae8ec287f433bb9d6d1ad85
+      image: public.ecr.aws/docker/library/alpine:3.20.3
       script: |
         #!/bin/sh
         echo "Installing git"
@@ -29,8 +28,7 @@ metadata:
 spec:
   sidecars:
     - name: cassandra
-      # public.ecr.aws/docker/library/cassandra:3.11.16-jammy
-      image: public.ecr.aws/docker/library/cassandra@sha256:b175d99b80f8108594d00c705288fdb3186b9fc07b30b4c292c3592cddb5f0b5
+      image: public.ecr.aws/docker/library/cassandra:3.11.16-jammy
       env:
         - name: MAX_HEAP_SIZE
           value: 2048m
@@ -44,14 +42,14 @@ spec:
           - 'describe cluster'
         initialDelaySeconds: 20
   params:
-  - name: imageDigest
+  - name: py-version
     type: string
   workspaces:
     - name: task-pvc
       mountPath: /workspace
   steps:
     - name: unittest
-      image: public.ecr.aws/docker/library/python@$(params.imageDigest)
+      image: public.ecr.aws/docker/library/python:$(params.py-version)-bookworm
       env:
         - name: TEST_CONFIGURATION
           value: cassandra
@@ -65,14 +63,14 @@ metadata:
   name: python-tracer-unittest-gevent-starlette-task
 spec:
   params:
-  - name: imageDigest
+  - name: py-version
     type: string
   workspaces:
     - name: task-pvc
       mountPath: /workspace
   steps:
     - name: unittest
-      image: public.ecr.aws/docker/library/python@$(params.imageDigest)
+      image: public.ecr.aws/docker/library/python:$(params.py-version)-bookworm
       env:
         - name: TEST_CONFIGURATION
           value: gevent_starlette
@@ -83,12 +81,11 @@ spec:
 apiVersion: tekton.dev/v1
 kind: Task
 metadata:
-  name: python-tracer-unittest-default-task
+  name: python-tracer-unittest-py-version-task
 spec:
   sidecars:
     - name: google-cloud-pubsub
-      # quay.io/thekevjames/gcloud-pubsub-emulator
-      image: quay.io/thekevjames/gcloud-pubsub-emulator@sha256:9bad1f28e6a3d6cd5f462c654c736faa4cf49732d9422ddb427ad30f3037c0ff
+      image: quay.io/thekevjames/gcloud-pubsub-emulator
       env:
         - name: PUBSUB_EMULATOR_HOST
           value: 0.0.0.0:8681
@@ -98,19 +95,16 @@ spec:
         - containerPort: 8681
           hostPort: 8681
     - name: mariadb
-      # public.ecr.aws/docker/library/mariadb:11.3.2
-      image: public.ecr.aws/docker/library/mariadb@sha256:a4a81ab6d190db84b67f286fd0511cdea619a24b63790b3db4fb69d263a5cd37
+      image: public.ecr.aws/docker/library/mariadb:11.3.2
       env:
         - name: MYSQL_ROOT_PASSWORD # or MARIADB_ROOT_PASSWORD
           value: passw0rd
         - name: MYSQL_DATABASE # or MARIADB_DATABASE
           value: instana_test_db
     - name: mongo
-      # public.ecr.aws/docker/library/mongo:7.0.6
-      image: public.ecr.aws/docker/library/mongo@sha256:3a023748ee30e915dd51642f1ef430c73c4e54937060054ca84c70417f510cc5
+      image: public.ecr.aws/docker/library/mongo:7.0.6
     - name: postgres
-      # public.ecr.aws/docker/library/postgres:16.2-bookworm
-      image: public.ecr.aws/docker/library/postgres@sha256:07572430dbcd821f9f978899c3ab3a727f5029be9298a41662e1b5404d5b73e0
+      image: public.ecr.aws/docker/library/postgres:16.2-bookworm
       env:
         - name: POSTGRES_USER
           value: root
@@ -126,20 +120,18 @@ spec:
           - pg_isready --host 127.0.0.1 --port 5432 --dbname=${POSTGRES_DB}
         timeoutSeconds: 10
     - name: redis
-      # public.ecr.aws/docker/library/redis:7.2.4-bookworm
-      image: public.ecr.aws/docker/library/redis@sha256:9341b6548cc35b64a6de0085555264336e2f570e17ecff20190bf62222f2bd64
+      image: public.ecr.aws/docker/library/redis:7.2.4-bookworm
     - name: rabbitmq
-      # public.ecr.aws/docker/library/rabbitmq:3.13.0
-      image: public.ecr.aws/docker/library/rabbitmq@sha256:39de1a4fc6c72d12bd5dfa23e8576536fd1c0cc8418344cd5a51addfc9a1145d
+      image: public.ecr.aws/docker/library/rabbitmq:3.13.0
   params:
-  - name: imageDigest
+  - name: py-version
     type: string
   workspaces:
     - name: task-pvc
       mountPath: /workspace
   steps:
     - name: unittest
-      image: public.ecr.aws/docker/library/python@$(params.imageDigest)
+      image: public.ecr.aws/docker/library/python:$(params.py-version)-bookworm
       env:
         - name: TEST_CONFIGURATION
           value: default
@@ -153,14 +145,14 @@ metadata:
   name: python-tracer-unittest-aws-task
 spec:
   params:
-  - name: imageDigest
+  - name: py-version
     type: string
   workspaces:
     - name: task-pvc
       mountPath: /workspace
   steps:
     - name: unittest
-      image: public.ecr.aws/docker/library/python@$(params.imageDigest)
+      image: public.ecr.aws/docker/library/python:$(params.py-version)-bookworm
       env:
         - name: TEST_CONFIGURATION
           value: aws
@@ -193,17 +185,85 @@ spec:
         - name: KAFKA_CFG_ADVERTISED_LISTENERS
           value: "PLAINTEXT://kafka:9092,EXTERNAL://localhost:9094"
   params:
-  - name: imageDigest
+  - name: py-version
     type: string
   workspaces:
     - name: task-pvc
       mountPath: /workspace
   steps:
     - name: unittest
-      image: public.ecr.aws/docker/library/python@$(params.imageDigest)
+      image: public.ecr.aws/docker/library/python:$(params.py-version)-bookworm
       env:
         - name: TEST_CONFIGURATION
           value: kafka
       workingDir: /workspace/python-sensor/
       command:
       - /workspace/python-sensor/.tekton/run_unittests.sh
+
+---
+apiVersion: tekton.dev/v1
+kind: Task
+metadata:
+  name: python-tracer-unittest-python-next-task
+spec:
+  sidecars:
+    - name: google-cloud-pubsub
+      # quay.io/thekevjames/gcloud-pubsub-emulator
+      image: quay.io/thekevjames/gcloud-pubsub-emulator@sha256:9bad1f28e6a3d6cd5f462c654c736faa4cf49732d9422ddb427ad30f3037c0ff
+      env:
+        - name: PUBSUB_EMULATOR_HOST
+          value: 0.0.0.0:8681
+        - name: PUBSUB_PROJECT1
+          value: test-project,test-topic
+      ports:
+        - containerPort: 8681
+          hostPort: 8681
+    - name: mariadb
+      # public.ecr.aws/docker/library/mariadb:11.3.2
+      image: public.ecr.aws/docker/library/mariadb@sha256:a4a81ab6d190db84b67f286fd0511cdea619a24b63790b3db4fb69d263a5cd37
+      env:
+        - name: MYSQL_ROOT_PASSWORD # or MARIADB_ROOT_PASSWORD
+          value: passw0rd
+        - name: MYSQL_DATABASE # or MARIADB_DATABASE
+          value: instana_test_db
+    - name: mongo
+      # public.ecr.aws/docker/library/mongo:7.0.6
+      image: public.ecr.aws/docker/library/mongo@sha256:3a023748ee30e915dd51642f1ef430c73c4e54937060054ca84c70417f510cc5
+    - name: postgres
+      # public.ecr.aws/docker/library/postgres:16.2-bookworm
+      image: public.ecr.aws/docker/library/postgres@sha256:07572430dbcd821f9f978899c3ab3a727f5029be9298a41662e1b5404d5b73e0
+      env:
+        - name: POSTGRES_USER
+          value: root
+        - name: POSTGRES_PASSWORD
+          value: passw0rd
+        - name: POSTGRES_DB
+          value: instana_test_db
+      readinessProbe:
+        exec:
+          command:
+          - sh
+          - -c
+          - pg_isready --host 127.0.0.1 --port 5432 --dbname=${POSTGRES_DB}
+        timeoutSeconds: 10
+    - name: redis
+      # public.ecr.aws/docker/library/redis:7.2.4-bookworm
+      image: public.ecr.aws/docker/library/redis@sha256:9341b6548cc35b64a6de0085555264336e2f570e17ecff20190bf62222f2bd64
+    - name: rabbitmq
+      # public.ecr.aws/docker/library/rabbitmq:3.13.0
+      image: public.ecr.aws/docker/library/rabbitmq@sha256:39de1a4fc6c72d12bd5dfa23e8576536fd1c0cc8418344cd5a51addfc9a1145d
+  params:
+  - name: py-version
+    type: string
+  workspaces:
+    - name: task-pvc
+      mountPath: /workspace
+  steps:
+    - name: unittest-$(params.py-version)
+      image: public.ecr.aws/docker/library/python:$(params.py-version)-bookworm
+      env:
+        - name: TEST_CONFIGURATION
+          value: default
+      workingDir: /workspace/python-sensor/
+      command:
+      - /workspace/python-sensor/.tekton/run_unittests.sh
