Merge branch 'sclorg:master' into master

SlouchyButton · Aug 1, 2024 · 5cd9a70 · 5cd9a70
2 parents 9302810 + 5d94af4
commit 5cd9a70
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 17 deletions.
diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
@@ -0,0 +1,39 @@
+name: Build and push container images to Quay.io registry
+on:
+  push:
+    branches:
+      - master
+  schedule:
+      - cron: '0 1 * * 3'
+
+jobs:
+  build-and-push:
+    if: github.repository_owner == 'sclorg'
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - dockerfile: "3.3/Dockerfile.fedora"
+            registry_namespace: "fedora"
+            quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
+            quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
+            tag: "33"
+            docker_context: "3.3"
+            image_name: "ruby-33"
+
+    steps:
+      - name: Build and push to quay.io registry
+        uses: sclorg/build-and-push-action@v4
+        with:
+          registry: "quay.io"
+          registry_namespace: ${{ matrix.registry_namespace }}
+          registry_username: ${{ secrets[matrix.quayio_username] }}
+          registry_token: ${{ secrets[matrix.quayio_token] }}
+          dockerfile: ${{ matrix.dockerfile }}
+          docker_context: ${{ matrix.docker_context }}
+          tag: ${{ matrix.tag }}
+          image_name: ${{ matrix.image_name }}
+          archs: amd64, arm64
+          readme: "${{ matrix.docker_context }}/README.md"
+          quay_application_token: ${{ secrets.QUAY_IMAGE_SCLORG_UPDATE_DESC }}
diff --git a/common b/common
diff --git a/examples/rails-postgresql-persistent.json b/examples/rails-postgresql-persistent.json
@@ -141,10 +141,7 @@
               "secret": "${GITHUB_WEBHOOK_SECRET}"
             }
           }
-        ],
-        "postCommit": {
-          "script": "bundle exec rake test"
-        }
+        ]
       }
     },
     {

diff --git a/test/test_ruby_ex_standalone.py b/test/test_ruby_ex_standalone.py
@@ -7,11 +7,11 @@
 from container_ci_suite.openshift import OpenShiftAPI
 
 if not check_variables():
-    print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.")
+    print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
 
 
-VERSION = os.getenv("SINGLE_VERSION")
+VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("TARGET")
 

diff --git a/test/test_ruby_latest_imagestreams.py b/test/test_ruby_latest_imagestreams.py
@@ -9,10 +9,10 @@
 TEST_DIR = Path(os.path.abspath(os.path.dirname(__file__)))
 
 if not check_variables():
-    print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.")
+    print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
 
-VERSION = os.getenv("SINGLE_VERSION")
+VERSION = os.getenv("VERSION")
 
 
 # Replacement with 'test_latest_imagestreams'

diff --git a/test/test_s2i_imagestreams.py b/test/test_s2i_imagestreams.py
@@ -6,11 +6,11 @@
 
 
 if not check_variables():
-    print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.")
+    print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
 
 
-VERSION = os.getenv("SINGLE_VERSION")
+VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("OS")
 

diff --git a/test/test_s2i_integration.py b/test/test_s2i_integration.py
@@ -5,11 +5,11 @@
 from container_ci_suite.openshift import OpenShiftAPI
 
 if not check_variables():
-    print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.")
+    print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
 
 
-VERSION = os.getenv("SINGLE_VERSION")
+VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("TARGET")
 

diff --git a/test/test_s2i_local_templates.py b/test/test_s2i_local_templates.py
@@ -7,11 +7,11 @@
 from container_ci_suite.utils import check_variables
 
 if not check_variables():
-    print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.")
+    print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
 
 
-VERSION = os.getenv("SINGLE_VERSION")
+VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("TARGET")
 

diff --git a/test/test_s2i_rails_ex_templates.py b/test/test_s2i_rails_ex_templates.py
@@ -7,11 +7,11 @@
 from container_ci_suite.utils import check_variables
 
 if not check_variables():
-    print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.")
+    print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
 
 
-VERSION = os.getenv("SINGLE_VERSION")
+VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("TARGET")
+14 −12		.github/workflows/container-tests.yml
+7 −7		README.md
+4 −14		betka.py
+2 −7		build.sh
+0 −3		check_imagestreams.py
+2 −9		common.mk
+0 −3		show_all_imagestreams.py
+3 −3		test-lib-openshift.sh
+1 −3		test-lib-remote-openshift.sh
+3 −5		test-lib.sh
+1 −1		test.sh
+3 −3		tests/check_betka.sh
+1 −1		tests/check_imagestreams.sh
+0 −2		tests/failures/check/v0/Dockerfile
+2 −0		tests/failures/check/v0/Dockerfile.c10s
+0 −2		tests/failures/check/v0/Dockerfile.rhel7
+3 −3		tests/imagestreams/testing_file.json
+14 −4		tests/test-lib/image_availability
+4 −4		tests/test-lib/public_image_name
-Original file line number
+Diff line change
@@ Expand Up / @@ -141,10 +141,7 @@ @@
                   "secret": "${GITHUB_WEBHOOK_SECRET}"
                 }
               }
-            ],
-            "postCommit": {
-              "script": "bundle exec rake test"
-            }
+            ]
           }
         },
         {
@@ Expand Down @@