From f95a7eeafcebee09bff97416b2742d344c5dbd99 Mon Sep 17 00:00:00 2001 From: Janin-Michel-Mathias Date: Tue, 30 Sep 2025 14:45:17 +0200 Subject: [PATCH 1/2] chore: migrate to gh packages --- .github/workflows/manual-run.yml | 16 ++++++++--- .github/workflows/nightly.yml | 18 ++++++++++--- .github/workflows/on-code-change.yml | 22 ++++++++++----- .github/workflows/on-merge.yml | 28 +++++++++++++------- .github/workflows/on-release.yml | 6 ++--- .github/workflows/schedule-sonar.yml | 2 +- javascript-modules-engine/tests/.env.example | 2 +- 7 files changed, 67 insertions(+), 27 deletions(-) diff --git a/.github/workflows/manual-run.yml b/.github/workflows/manual-run.yml index 028f121b..34143c0e 100644 --- a/.github/workflows/manual-run.yml +++ b/.github/workflows/manual-run.yml @@ -8,7 +8,7 @@ on: jahia_image: description: "Jahia Image" required: true - default: "jahia/jahia-ee-dev:8-SNAPSHOT" + default: "ghcr.io/jahia/jahia-ee-dev:8-SNAPSHOT" manifest: description: "Provisioning manifest. Can be a local repository file in the tests folder or a publicly accessible link" required: true @@ -38,8 +38,18 @@ jobs: should_use_build_artifacts: false github_artifact_name: js-eng-${{ github.run_number }} bastion_ssh_private_key: ${{ secrets.BASTION_SSH_PRIVATE_KEY_JAHIACI }} - docker_username: ${{ secrets.DOCKERHUB_USERNAME }} - docker_password: ${{ secrets.DOCKERHUB_PASSWORD }} + docker_registries: | + [ + { + "registry": "ghcr.io", + "username": "${{ secrets.GH_PACKAGES_USERNAME }}", + "password": "${{ secrets.GH_PACKAGES_TOKEN }}" + }, + { + "username": "${{ secrets.DOCKERHUB_USERNAME }}", + "password": "${{ secrets.DOCKERHUB_PASSWORD }}" + } + ] nexus_username: ${{ secrets.NEXUS_USERNAME }} nexus_password: ${{ secrets.NEXUS_PASSWORD }} testrail_username: ${{ secrets.TESTRAIL_USERNAME }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c9f9e967..84ae952d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -13,8 +13,8 @@ jobs: fail-fast: false matrix: # For the time being testing on the release has been desactived since there is no release yet - # jahia_image: ["jahia/jahia-ee-dev:8", "jahia/jahia-ee-dev:8-SNAPSHOT"] - jahia_image: ["jahia/jahia-ee-dev:8-SNAPSHOT"] + # jahia_image: ["ghcr.io/jahia/jahia-ee-dev:8", "ghcr.io/jahia/jahia-ee-dev:8-SNAPSHOT"] + jahia_image: ["ghcr.io/jahia/jahia-ee-dev:8-SNAPSHOT"] timeout-minutes: 45 steps: - uses: jahia/jahia-modules-action/helper@v2 @@ -37,8 +37,18 @@ jobs: should_skip_testrail: false github_artifact_name: js-eng-${{ strategy.job-index }}-${{ github.run_number }} bastion_ssh_private_key: ${{ secrets.BASTION_SSH_PRIVATE_KEY_JAHIACI }} - docker_username: ${{ secrets.DOCKERHUB_USERNAME }} - docker_password: ${{ secrets.DOCKERHUB_PASSWORD }} + docker_registries: | + [ + { + "registry": "ghcr.io", + "username": "${{ secrets.GH_PACKAGES_USERNAME }}", + "password": "${{ secrets.GH_PACKAGES_TOKEN }}" + }, + { + "username": "${{ secrets.DOCKERHUB_USERNAME }}", + "password": "${{ secrets.DOCKERHUB_PASSWORD }}" + } + ] nexus_username: ${{ secrets.NEXUS_USERNAME }} nexus_password: ${{ secrets.NEXUS_PASSWORD }} testrail_username: ${{ secrets.TESTRAIL_USERNAME }} diff --git a/.github/workflows/on-code-change.yml b/.github/workflows/on-code-change.yml index 2e7c416c..7a0a6c1a 100644 --- a/.github/workflows/on-code-change.yml +++ b/.github/workflows/on-code-change.yml @@ -31,10 +31,10 @@ jobs: env: NEXUS_INTERNAL_URL: ${{ secrets.NEXUS_INTERNAL_URL }} container: - image: jahia/cimg-mvn-cache:ga_cimg_openjdk_17.0.9-node + image: ghcr.io/jahia/jahia-docker-mvn-cache:17-jdk-noble-mvn-loaded credentials: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + username: ${{ secrets.GH_PACKAGES_USERNAME }} + password: ${{ secrets.GH_PACKAGES_TOKEN }} steps: - uses: actions/checkout@v4 - uses: jahia/jahia-modules-action/build@v2 @@ -85,13 +85,23 @@ jobs: tests_path: "javascript-modules-engine/tests/" testrail_project: Javascript Modules Engine tests_manifest: provisioning-manifest-build.yml - jahia_image: jahia/jahia-ee-dev:8-SNAPSHOT + jahia_image: ghcr.io/jahia/jahia-ee-dev:8-SNAPSHOT jahia_license: ${{ secrets.JAHIA_LICENSE_8X_FULL }} should_use_build_artifacts: true github_artifact_name: js-eng-${{ github.run_number }} bastion_ssh_private_key: ${{ secrets.BASTION_SSH_PRIVATE_KEY_JAHIACI }} - docker_username: ${{ secrets.DOCKERHUB_USERNAME }} - docker_password: ${{ secrets.DOCKERHUB_PASSWORD }} + docker_registries: | + [ + { + "registry": "ghcr.io", + "username": "${{ secrets.GH_PACKAGES_USERNAME }}", + "password": "${{ secrets.GH_PACKAGES_TOKEN }}" + }, + { + "username": "${{ secrets.DOCKERHUB_USERNAME }}", + "password": "${{ secrets.DOCKERHUB_PASSWORD }}" + } + ] nexus_username: ${{ secrets.NEXUS_USERNAME }} nexus_password: ${{ secrets.NEXUS_PASSWORD }} tests_report_name: Test report (Standalone) diff --git a/.github/workflows/on-merge.yml b/.github/workflows/on-merge.yml index 51010d98..2c5fa10e 100644 --- a/.github/workflows/on-merge.yml +++ b/.github/workflows/on-merge.yml @@ -34,10 +34,10 @@ jobs: env: NEXUS_INTERNAL_URL: https://devtools.jahia.com/nexus/content/groups/internal/ container: - image: jahia/cimg-mvn-cache:ga_cimg_openjdk_17.0.9-node + image: ghcr.io/jahia/jahia-docker-mvn-cache:17-jdk-noble-mvn-loaded credentials: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + username: ${{ secrets.GH_PACKAGES_USERNAME }} + password: ${{ secrets.GH_PACKAGES_TOKEN }} steps: - uses: actions/checkout@v4 - uses: jahia/jahia-modules-action/build@v2 @@ -81,14 +81,24 @@ jobs: tests_path: "javascript-modules-engine/tests/" testrail_project: Javascript Modules Engine tests_manifest: provisioning-manifest-build.yml - jahia_image: jahia/jahia-ee-dev:8-SNAPSHOT + jahia_image: ghcr.io/jahia/jahia-ee-dev:8-SNAPSHOT jahia_license: ${{ secrets.JAHIA_LICENSE_8X_FULL }} should_use_build_artifacts: true should_skip_testrail: false github_artifact_name: js-eng-${{ github.run_number }} bastion_ssh_private_key: ${{ secrets.BASTION_SSH_PRIVATE_KEY_JAHIACI }} - docker_username: ${{ secrets.DOCKERHUB_USERNAME }} - docker_password: ${{ secrets.DOCKERHUB_PASSWORD }} + docker_registries: | + [ + { + "registry": "ghcr.io", + "username": "${{ secrets.GH_PACKAGES_USERNAME }}", + "password": "${{ secrets.GH_PACKAGES_TOKEN }}" + }, + { + "username": "${{ secrets.DOCKERHUB_USERNAME }}", + "password": "${{ secrets.DOCKERHUB_PASSWORD }}" + } + ] nexus_username: ${{ secrets.NEXUS_USERNAME }} nexus_password: ${{ secrets.NEXUS_PASSWORD }} tests_report_name: Test report (Standalone) @@ -120,10 +130,10 @@ jobs: if: github.ref == 'refs/heads/main' runs-on: self-hosted container: - image: jahia/cimg-mvn-cache:ga_cimg_openjdk_17.0.9-node + image: ghcr.io/jahia/jahia-docker-mvn-cache:17-jdk-noble-mvn-loaded credentials: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + username: ${{ secrets.GH_PACKAGES_USERNAME }} + password: ${{ secrets.GH_PACKAGES_TOKEN }} steps: - uses: actions/checkout@v4 - name: Setup .yarnrc.yml file to allow publication to https://registry.npmjs.org with a 'yarn npm publish' diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml index 34398978..4e8b9751 100644 --- a/.github/workflows/on-release.yml +++ b/.github/workflows/on-release.yml @@ -16,10 +16,10 @@ jobs: # downloading the entire world when building. # More on https://github.com/Jahia/cimg-mvn-cache container: - image: jahia/cimg-mvn-cache:ga_cimg_openjdk_17.0.9-node + image: ghcr.io/jahia/jahia-docker-mvn-cache:17-jdk-noble-mvn-loaded credentials: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + username: ${{ secrets.GH_PACKAGES_USERNAME }} + password: ${{ secrets.GH_PACKAGES_TOKEN }} steps: - name: Add safe directory diff --git a/.github/workflows/schedule-sonar.yml b/.github/workflows/schedule-sonar.yml index 37e21e8c..61105b8b 100644 --- a/.github/workflows/schedule-sonar.yml +++ b/.github/workflows/schedule-sonar.yml @@ -21,6 +21,6 @@ jobs: tests_module_type: javascript git_branch: ${{ matrix.git_branch }} incident_service: javascript-modules-engine-sonar - job_container: jahia/cimg-mvn-cache:ga_cimg_openjdk_17.0.9-node + job_container: ghcr.io/jahia/jahia-docker-mvn-cache:17-jdk-noble-mvn-loaded java_distribution: temurin java_version: 17.0.9 diff --git a/javascript-modules-engine/tests/.env.example b/javascript-modules-engine/tests/.env.example index 18d261f1..a4431a1b 100644 --- a/javascript-modules-engine/tests/.env.example +++ b/javascript-modules-engine/tests/.env.example @@ -1,5 +1,5 @@ JAHIA_VERSION=${JAHIA_VERSION:-8.2-SNAPSHOT} -JAHIA_IMAGE=${JAHIA_IMAGE:-jahia/jahia-ee-dev:${JAHIA_VERSION}} +JAHIA_IMAGE=${JAHIA_IMAGE:-ghcr.io/jahia/jahia-ee-dev:${JAHIA_VERSION}} TESTS_IMAGE=${TESTS_IMAGE:-jahia/javascript-modules-engine:latest} MANIFEST=${MANIFEST:-provisioning-manifest-build.yml} JAHIA_URL=${JAHIA_URL:-http://jahia:8080} From 9d3686fa470108d03c8d929b22663303705c349e Mon Sep 17 00:00:00 2001 From: Janin-Michel-Mathias Date: Tue, 30 Sep 2025 15:14:35 +0200 Subject: [PATCH 2/2] fix: fix comment --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 84ae952d..45b11493 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: # For the time being testing on the release has been desactived since there is no release yet - # jahia_image: ["ghcr.io/jahia/jahia-ee-dev:8", "ghcr.io/jahia/jahia-ee-dev:8-SNAPSHOT"] + # jahia_image: ["jahia/jahia-ee-dev:8", "ghcr.io/jahia/jahia-ee-dev:8-SNAPSHOT"] jahia_image: ["ghcr.io/jahia/jahia-ee-dev:8-SNAPSHOT"] timeout-minutes: 45 steps: