Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions .github/workflows/manual-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down
18 changes: 14 additions & 4 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Comment thread
Janin-Michel-Mathias marked this conversation as resolved.
Outdated
jahia_image: ["ghcr.io/jahia/jahia-ee-dev:8-SNAPSHOT"]
timeout-minutes: 45
steps:
- uses: jahia/jahia-modules-action/helper@v2
Expand All @@ -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 }}
Expand Down
22 changes: 16 additions & 6 deletions .github/workflows/on-code-change.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
28 changes: 19 additions & 9 deletions .github/workflows/on-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule-sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion javascript-modules-engine/tests/.env.example
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
Loading