From 0c088f3e604ca6ae23530cc720fdd48d176f5662 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:46:49 +0000 Subject: [PATCH 1/3] Bump common from `f994db1` to `1e271d8` Bumps [common](https://github.com/sclorg/container-common-scripts) from `f994db1` to `1e271d8`. - [Commits](https://github.com/sclorg/container-common-scripts/compare/f994db126f12c383490fee5913bbf87266011896...1e271d8d077833ceed1bc0fcb1eb9629ea5ea410) --- updated-dependencies: - dependency-name: common dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index f994db12..1e271d8d 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit f994db126f12c383490fee5913bbf87266011896 +Subproject commit 1e271d8d077833ceed1bc0fcb1eb9629ea5ea410 From 2470c5e12d12eac88a26f3576b9eab901a3d20b7 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Wed, 19 Jun 2024 14:36:26 +0200 Subject: [PATCH 2/3] Add build and push image to quay.io/fedora/ruby-33 repository Signed-off-by: Petr "Stone" Hracek --- .github/workflows/build-and-push.yml | 39 ++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/build-and-push.yml diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml new file mode 100644 index 00000000..3b75888d --- /dev/null +++ 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 }} From 5d94af488532ab8babb4a811a71b093b7a8537da Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Fri, 19 Jul 2024 14:33:01 +0200 Subject: [PATCH 3/3] Use VERSION instead of SINGLE_VERSION like we do in all test in org sclorg Signed-off-by: Petr "Stone" Hracek --- examples/rails-postgresql-persistent.json | 5 +---- test/test_ruby_ex_standalone.py | 4 ++-- test/test_ruby_latest_imagestreams.py | 4 ++-- test/test_s2i_imagestreams.py | 4 ++-- test/test_s2i_integration.py | 4 ++-- test/test_s2i_local_templates.py | 4 ++-- test/test_s2i_rails_ex_templates.py | 4 ++-- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/examples/rails-postgresql-persistent.json b/examples/rails-postgresql-persistent.json index 97d7fdd8..de21ca49 100644 --- 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 index 867cb870..fe7d4e51 100644 --- 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 index e3a58b7d..70aa92ac 100644 --- 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 index 79cfe574..00e61000 100644 --- 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 index 67436559..2e2ba60f 100644 --- 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 index 3d04583f..e996b56d 100644 --- 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 index dfeb31e8..bfb7d2af 100644 --- 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")