reverted changes that broke ci and added safty check for python

redhat-cop · Dec 13, 2023 · 8e6b84c · 8e6b84c
1 parent b35b7cc
commit 8e6b84c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/jenkins-agent-python-pr.yaml b/.github/workflows/jenkins-agent-python-pr.yaml
@@ -17,6 +17,16 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
+      - name: Check if version.json has been bumped
+        id: changes
+        run: echo "changed=$(git status --porcelain ${context}/version.json | wc -l)" >> $GITHUB_OUTPUT
+
+      - name: Fail if version.json not bumped
+        if: steps.changes.outputs.changed == 0
+        run: |
+          echo "${context}/version.json has not changed. Publishing the same tag removes the SHA, which causes issues. Failing."
+          exit 1
+
       - name: Check and verify version.json
         id: check_version
         uses: redhat-cop/github-actions/get-image-version@11f2ce27643eb7c76ac3623cb99d9b08be30d762 # v4

diff --git a/jenkins-agents/jenkins-agent-gradle/Dockerfile b/jenkins-agents/jenkins-agent-gradle/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.14
+FROM quay.io/openshift/origin-jenkins-agent-base:4.9
 
 ENV GRADLE_VERSION=6.3
 ENV GRADLE_USER_HOME=/home/jenkins/.gradle

diff --git a/jenkins-agents/jenkins-agent-python/version.json b/jenkins-agents/jenkins-agent-python/version.json
@@ -1 +1 @@
-{"version":"v1.1.0"}
+{"version":"v1.2.0"}
diff --git a/jenkins-agents/jenkins-agent-ruby/Dockerfile b/jenkins-agents/jenkins-agent-ruby/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.14
+FROM quay.io/openshift/origin-jenkins-agent-base:4.9
 
 ARG RUBY_VERSION=3.1
 # renovate: datasource=repology depName=homebrew/openshift-cli