[DNM] Sync Serverless CI config/

Makefile

@@ -105,7 +105,7 @@ cluster-profile-set-details:
 
 ci-operator-checkconfig: cluster-profile-set-details
 	$(SKIP_PULL) || $(CONTAINER_ENGINE) pull $(CONTAINER_ENGINE_OPTS) quay.io/openshift/ci-public:ci_ci-operator-checkconfig_latest
-	$(CONTAINER_ENGINE) run $(CONTAINER_ENGINE_OPTS) $(CONTAINER_USER) --rm -v "$(CURDIR)/ci-operator/config:/ci-operator/config$(VOLUME_MOUNT_FLAGS)" -v "$(CURDIR)/ci-operator/step-registry:/ci-operator/step-registry$(VOLUME_MOUNT_FLAGS)" -v "$(CURDIR)/ci-operator/step-registry/cluster-profiles:/ci-operator/step-registry/cluster-profiles$(VOLUME_MOUNT_FLAGS)" -v "$(CURDIR)/core-services/cluster-pools:/core-services/cluster-pools$(VOLUME_MOUNT_FLAGS)" -v "$(CURDIR)/cluster-profile-set-details.json:/cluster-profile-set-details.json" quay.io/openshift/ci-public:ci_ci-operator-checkconfig_latest --config-dir /ci-operator/config --registry /ci-operator/step-registry --cluster-profiles-config /ci-operator/step-registry/cluster-profiles/cluster-profiles-config.yaml --cluster-claim-owners-config /core-services/cluster-pools/_config.yaml --cluster-profile-set-details /cluster-profile-set-details.json
+	$(CONTAINER_ENGINE) run $(CONTAINER_ENGINE_OPTS) $(CONTAINER_USER) --rm -v "$(CURDIR)/ci-operator/config:/ci-operator/config$(VOLUME_MOUNT_FLAGS)" -v "$(CURDIR)/ci-operator/step-registry:/ci-operator/step-registry$(VOLUME_MOUNT_FLAGS)" -v "$(CURDIR)/ci-operator/step-registry/cluster-profiles:/ci-operator/step-registry/cluster-profiles$(VOLUME_MOUNT_FLAGS)" -v "$(CURDIR)/core-services/cluster-pools:/core-services/cluster-pools$(VOLUME_MOUNT_FLAGS)" -v "$(CURDIR)/cluster-profile-set-details.json:/cluster-profile-set-details.json$(VOLUME_MOUNT_FLAGS)" quay.io/openshift/ci-public:ci_ci-operator-checkconfig_latest --config-dir /ci-operator/config --registry /ci-operator/step-registry --cluster-profiles-config /ci-operator/step-registry/cluster-profiles/cluster-profiles-config.yaml --cluster-claim-owners-config /core-services/cluster-pools/_config.yaml --cluster-profile-set-details /cluster-profile-set-details.json
 .PHONY: ci-operator-checkconfig
 
 ci-operator-config: 

ci-operator/config/openshift-knative/backstage-plugins/openshift-knative-backstage-plugins-release-v1.17__421.yaml

@@ -24,12 +24,17 @@ images:
   - dockerfile_path: openshift/ci-operator/source-image/Dockerfile
     from: src
     to: knative-backstage-plugins-source-image
-  run_if_changed: ^non-existing$
+  skip_if_only_changed: ^.tekton/.*|^.konflux.*|^.github/.*|^rpms.lock.yaml$|^hack/(lib$|[^l].*|l[^i].*|li[^b].*|lib[^/].*)|^OWNERS.*|.*\.md
+promotion:
+  to:
+  - additional_images:
+      backstage-plugins-src: src
+    namespace: openshift
+    tag: knative-v1.17
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: fast
       version: "4.21"
 resources:
   '*':

ci-operator/config/openshift-knative/backstage-plugins/openshift-knative-backstage-plugins-release-v1.17__420.yaml → ci-operator/config/openshift-knative/backstage-plugins/openshift-knative-backstage-plugins-release-v1.17__422.yaml

@@ -24,18 +24,13 @@ images:
   - dockerfile_path: openshift/ci-operator/source-image/Dockerfile
     from: src
     to: knative-backstage-plugins-source-image
-  skip_if_only_changed: ^.tekton/.*|^.konflux.*|^.github/.*|^rpms.lock.yaml$|^hack/(lib$|[^l].*|l[^i].*|li[^b].*|lib[^/].*)|^OWNERS.*|.*\.md
-promotion:
-  to:
-  - additional_images:
-      backstage-plugins-src: src
-    namespace: openshift
-    tag: knative-v1.17
+  run_if_changed: ^non-existing$
 releases:
   latest:
-    release:
-      channel: fast
-      version: "4.20"
+    candidate:
+      product: ocp
+      stream: nightly
+      version: "4.22"
 resources:
   '*':
     requests:
@@ -45,4 +40,4 @@ zz_generated_metadata:
   branch: release-v1.17
   org: openshift-knative
   repo: backstage-plugins
-  variant: "420"
+  variant: "422"

ci-operator/config/openshift-knative/backstage-plugins/openshift-knative-backstage-plugins-release-v1.21__414.yaml → ci-operator/config/openshift-knative/backstage-plugins/openshift-knative-backstage-plugins-release-v1.21__416.yaml

@@ -35,7 +35,7 @@ releases:
   latest:
     release:
       channel: fast
-      version: "4.14"
+      version: "4.16"
 resources:
   '*':
     requests:
@@ -45,4 +45,4 @@ zz_generated_metadata:
   branch: release-v1.21
   org: openshift-knative
   repo: backstage-plugins
-  variant: "414"
+  variant: "416"

ci-operator/config/openshift-knative/backstage-plugins/openshift-knative-backstage-plugins-release-v1.21__421.yaml

@@ -24,12 +24,17 @@ images:
   - dockerfile_path: openshift/ci-operator/source-image/Dockerfile
     from: src
     to: knative-backstage-plugins-source-image
-  run_if_changed: ^non-existing$
+  skip_if_only_changed: ^.tekton/.*|^.konflux.*|^.github/.*|^rpms.lock.yaml$|^hack/(lib$|[^l].*|l[^i].*|li[^b].*|lib[^/].*)|^OWNERS.*|.*\.md
+promotion:
+  to:
+  - additional_images:
+      backstage-plugins-src: src
+    namespace: openshift
+    tag: knative-v1.21
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: fast
       version: "4.21"
 resources:
   '*':

ci-operator/config/openshift-knative/backstage-plugins/openshift-knative-backstage-plugins-release-v1.21__420.yaml → ci-operator/config/openshift-knative/backstage-plugins/openshift-knative-backstage-plugins-release-v1.21__422.yaml

@@ -24,18 +24,13 @@ images:
   - dockerfile_path: openshift/ci-operator/source-image/Dockerfile
     from: src
     to: knative-backstage-plugins-source-image
-  skip_if_only_changed: ^.tekton/.*|^.konflux.*|^.github/.*|^rpms.lock.yaml$|^hack/(lib$|[^l].*|l[^i].*|li[^b].*|lib[^/].*)|^OWNERS.*|.*\.md
-promotion:
-  to:
-  - additional_images:
-      backstage-plugins-src: src
-    namespace: openshift
-    tag: knative-v1.21
+  run_if_changed: ^non-existing$
 releases:
   latest:
-    release:
-      channel: fast
-      version: "4.20"
+    candidate:
+      product: ocp
+      stream: nightly
+      version: "4.22"
 resources:
   '*':
     requests:
@@ -45,4 +40,4 @@ zz_generated_metadata:
   branch: release-v1.21
   org: openshift-knative
   repo: backstage-plugins
-  variant: "420"
+  variant: "422"

ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.17__421.yaml

@@ -70,35 +70,36 @@ images:
   - dockerfile_path: openshift/ci-operator/source-image/Dockerfile
     from: src
     to: knative-client-source-image
-  run_if_changed: ^non-existing$
+  skip_if_only_changed: ^.tekton/.*|^.konflux.*|^.github/.*|^rpms.lock.yaml$|^hack/(lib$|[^l].*|l[^i].*|li[^b].*|lib[^/].*)|^OWNERS.*|.*\.md
 promotion:
   to:
   - additional_images:
       client-src: src
+    name: knative-v1.17
     namespace: openshift
-    tag: knative-v1.17
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: fast
       version: "4.21"
 resources:
   '*':
     requests:
       cpu: 500m
       memory: 1Gi
 tests:
-- always_run: false
-  as: test-e2e
+- as: test-e2e
+  cluster_claim:
+    architecture: amd64
+    cloud: aws
+    owner: serverless-ci
+    product: ocp
+    timeout: 2h0m0s
+    version: "4.21"
+  skip_if_only_changed: ^.tekton/.*|^.konflux.*|^.github/.*|^rpms.lock.yaml$|^hack/(lib$|[^l].*|l[^i].*|li[^b].*|lib[^/].*)|^OWNERS.*|.*\.md
   steps:
     allow_best_effort_post_steps: true
     allow_skip_on_success: true
-    cluster_profile: aws-serverless
-    env:
-      BASE_DOMAIN: serverless.devcluster.openshift.com
-      SPOT_INSTANCES: "true"
-      ZONES_COUNT: "1"
     post:
     - as: testlog-gather
       best_effort: true
@@ -145,7 +146,6 @@ tests:
           cpu: 300m
           memory: 300Mi
       timeout: 20m0s
-    - ref: ipi-deprovision-deprovision
     test:
     - as: test
       cli: latest
@@ -167,7 +167,7 @@ tests:
         requests:
           cpu: 100m
       timeout: 4h0m0s
-    workflow: ipi-aws
+    workflow: generic-claim
 zz_generated_metadata:
   branch: release-v1.17
   org: openshift-knative

ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.17__420.yaml → ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.17__422.yaml

@@ -70,36 +70,35 @@ images:
   - dockerfile_path: openshift/ci-operator/source-image/Dockerfile
     from: src
     to: knative-client-source-image
-  skip_if_only_changed: ^.tekton/.*|^.konflux.*|^.github/.*|^rpms.lock.yaml$|^hack/(lib$|[^l].*|l[^i].*|li[^b].*|lib[^/].*)|^OWNERS.*|.*\.md
+  run_if_changed: ^non-existing$
 promotion:
   to:
   - additional_images:
       client-src: src
-    name: knative-v1.17
     namespace: openshift
+    tag: knative-v1.17
 releases:
   latest:
-    release:
-      channel: fast
-      version: "4.20"
+    candidate:
+      product: ocp
+      stream: nightly
+      version: "4.22"
 resources:
   '*':
     requests:
       cpu: 500m
       memory: 1Gi
 tests:
-- as: test-e2e
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: serverless-ci
-    product: ocp
-    timeout: 2h0m0s
-    version: "4.20"
-  skip_if_only_changed: ^.tekton/.*|^.konflux.*|^.github/.*|^rpms.lock.yaml$|^hack/(lib$|[^l].*|l[^i].*|li[^b].*|lib[^/].*)|^OWNERS.*|.*\.md
+- always_run: false
+  as: test-e2e
   steps:
     allow_best_effort_post_steps: true
     allow_skip_on_success: true
+    cluster_profile: aws-serverless
+    env:
+      BASE_DOMAIN: serverless.devcluster.openshift.com
+      SPOT_INSTANCES: "true"
+      ZONES_COUNT: "1"
     post:
     - as: testlog-gather
       best_effort: true
@@ -146,6 +145,7 @@ tests:
           cpu: 300m
           memory: 300Mi
       timeout: 20m0s
+    - ref: ipi-deprovision-deprovision
     test:
     - as: test
       cli: latest
@@ -167,9 +167,9 @@ tests:
         requests:
           cpu: 100m
       timeout: 4h0m0s
-    workflow: generic-claim
+    workflow: ipi-aws
 zz_generated_metadata:
   branch: release-v1.17
   org: openshift-knative
   repo: client
-  variant: "420"
+  variant: "422"

ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.21__421.yaml

@@ -70,35 +70,36 @@ images:
   - dockerfile_path: openshift/ci-operator/source-image/Dockerfile
     from: src
     to: knative-client-source-image
-  run_if_changed: ^non-existing$
+  skip_if_only_changed: ^.tekton/.*|^.konflux.*|^.github/.*|^rpms.lock.yaml$|^hack/(lib$|[^l].*|l[^i].*|li[^b].*|lib[^/].*)|^OWNERS.*|.*\.md
 promotion:
   to:
   - additional_images:
       client-src: src
+    name: knative-v1.21
     namespace: openshift
-    tag: knative-v1.21
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: fast
       version: "4.21"
 resources:
   '*':
     requests:
       cpu: 500m
       memory: 1Gi
 tests:
-- always_run: false
-  as: test-e2e
+- as: test-e2e
+  cluster_claim:
+    architecture: amd64
+    cloud: aws
+    owner: serverless-ci
+    product: ocp
+    timeout: 2h0m0s
+    version: "4.21"
+  skip_if_only_changed: ^.tekton/.*|^.konflux.*|^.github/.*|^rpms.lock.yaml$|^hack/(lib$|[^l].*|l[^i].*|li[^b].*|lib[^/].*)|^OWNERS.*|.*\.md
   steps:
     allow_best_effort_post_steps: true
     allow_skip_on_success: true
-    cluster_profile: aws-serverless
-    env:
-      BASE_DOMAIN: serverless.devcluster.openshift.com
-      SPOT_INSTANCES: "true"
-      ZONES_COUNT: "1"
     post:
     - as: testlog-gather
       best_effort: true
@@ -145,7 +146,6 @@ tests:
           cpu: 300m
           memory: 300Mi
       timeout: 20m0s
-    - ref: ipi-deprovision-deprovision
     test:
     - as: test
       cli: latest
@@ -167,7 +167,7 @@ tests:
         requests:
           cpu: 100m
       timeout: 4h0m0s
-    workflow: ipi-aws
+    workflow: generic-claim
 zz_generated_metadata:
   branch: release-v1.21
   org: openshift-knative

ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.21__420.yaml → ci-operator/config/openshift-knative/client/openshift-knative-client-release-v1.21__422.yaml

@@ -70,36 +70,35 @@ images:
   - dockerfile_path: openshift/ci-operator/source-image/Dockerfile
     from: src
     to: knative-client-source-image
-  skip_if_only_changed: ^.tekton/.*|^.konflux.*|^.github/.*|^rpms.lock.yaml$|^hack/(lib$|[^l].*|l[^i].*|li[^b].*|lib[^/].*)|^OWNERS.*|.*\.md
+  run_if_changed: ^non-existing$
 promotion:
   to:
   - additional_images:
       client-src: src
-    name: knative-v1.21
     namespace: openshift
+    tag: knative-v1.21
 releases:
   latest:
-    release:
-      channel: fast
-      version: "4.20"
+    candidate:
+      product: ocp
+      stream: nightly
+      version: "4.22"
 resources:
   '*':
     requests:
       cpu: 500m
       memory: 1Gi
 tests:
-- as: test-e2e
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: serverless-ci
-    product: ocp
-    timeout: 2h0m0s
-    version: "4.20"
-  skip_if_only_changed: ^.tekton/.*|^.konflux.*|^.github/.*|^rpms.lock.yaml$|^hack/(lib$|[^l].*|l[^i].*|li[^b].*|lib[^/].*)|^OWNERS.*|.*\.md
+- always_run: false
+  as: test-e2e
   steps:
     allow_best_effort_post_steps: true
     allow_skip_on_success: true
+    cluster_profile: aws-serverless
+    env:
+      BASE_DOMAIN: serverless.devcluster.openshift.com
+      SPOT_INSTANCES: "true"
+      ZONES_COUNT: "1"
     post:
     - as: testlog-gather
       best_effort: true
@@ -146,6 +145,7 @@ tests:
           cpu: 300m
           memory: 300Mi
       timeout: 20m0s
+    - ref: ipi-deprovision-deprovision
     test:
     - as: test
       cli: latest
@@ -167,9 +167,9 @@ tests:
         requests:
           cpu: 100m
       timeout: 4h0m0s
-    workflow: generic-claim
+    workflow: ipi-aws
 zz_generated_metadata:
   branch: release-v1.21
   org: openshift-knative
   repo: client
-  variant: "420"
+  variant: "422"