Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support patch version promotion update in prowcopy #153

Conversation

pierDipi
Copy link
Member

@pierDipi pierDipi commented May 9, 2024

When from branch and target branch are equal

  • Skip Deleting configuration
  • Skip running injectors

Tested with:

go run ./cmd/prowcopy --from-branch "release-1.33" --branch "release-1.33" --tag "1.33.1" --config config/serverless-operator.yaml --config-branch main

and I get the expected diff:

pierdipi@pierdipi release (master) $ git diff
diff --git a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-release-1.33__412.yaml b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-release-1.33__412.yaml
index cf733c871e2..705869b971d 100755
--- a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-release-1.33__412.yaml
+++ b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-release-1.33__412.yaml
@@ -102,7 +102,7 @@ promotion:
   to:
   - additional_images:
       serverless-operator-src: src
-    name: release-1.33
+    name: 1.33.1
     namespace: knative
 releases:
   latest:
diff --git a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-release-1.33__415.yaml b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-release-1.33__415.yaml
index c65373b759e..73099f8190c 100755
--- a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-release-1.33__415.yaml
+++ b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-release-1.33__415.yaml
@@ -103,7 +103,7 @@ promotion:
   - additional_images:
       serverless-operator-src: src
     namespace: knative
-    tag: release-1.33
+    tag: 1.33.1
 releases:
   latest:
     release:

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
@pierDipi
Copy link
Member Author

pierDipi commented May 9, 2024

/cc @mgencur

@openshift-ci openshift-ci bot requested a review from mgencur May 9, 2024 09:44
pierDipi added a commit to pierDipi/serverless-operator that referenced this pull request May 9, 2024
When creating a new branch or updating a patch version for a
release branch, we will run the automation to regenarate the
CI config and update the promotion tag according to `project.yaml`
version

Depends on openshift-knative/hack#153

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
Copy link
Member

@cardil cardil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

Copy link

openshift-ci bot commented May 9, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cardil, pierDipi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit aa3b847 into openshift-knative:main May 9, 2024
4 checks passed
pierDipi added a commit to openshift-knative/serverless-operator that referenced this pull request May 10, 2024
* Generate CI supports patch versions

When creating a new branch or updating a patch version for a
release branch, we will run the automation to regenarate the
CI config and update the promotion tag according to `project.yaml`
version

Depends on openshift-knative/hack#153

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Install yq

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

---------

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/serverless-operator that referenced this pull request May 10, 2024
When creating a new branch or updating a patch version for a
release branch, we will run the automation to regenarate the
CI config and update the promotion tag according to `project.yaml`
version

Depends on openshift-knative/hack#153

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
pierDipi added a commit to openshift-knative/serverless-operator that referenced this pull request May 10, 2024
* Generate CI supports patch versions

When creating a new branch or updating a patch version for a
release branch, we will run the automation to regenarate the
CI config and update the promotion tag according to `project.yaml`
version

Depends on openshift-knative/hack#153

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Install yq

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

---------

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
Co-authored-by: Pierangelo Di Pilato <pierdipi@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants