Skip to content

Commit

Permalink
BACKLOG-21821 Comment out tests and sbom for now
Browse files Browse the repository at this point in the history
  • Loading branch information
@AKarmanov
AKarmanov committed Jan 8, 2024
1 parent 67b16db commit 8db8886
Show file tree
Hide file tree
Showing 2 changed files with 162 additions and 162 deletions.
208 changes: 104 additions & 104 deletions .github/workflows/on-code-change.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,107 +48,107 @@ jobs:
sonar_url: ${{ secrets.SONAR_URL }}
sonar_token: ${{ secrets.SONAR_TOKEN }}

integration-tests:
name: Integration Tests
needs: build
# Use self-hosted if you want to run on our own runners
# you would typically want to use self-hosted runners for integration tests
runs-on: self-hosted
# Timeout is important as it forces the job to fail if it hangs for any reason,
# If not specified it will be left running until workflow run limit is reached (72h)
timeout-minutes: 45
steps:
# The helper is used to print instructions, such as how to connect to the runner.
# It should be defined as a workflow step (vs a step in an action itself) since some
# annotations are only posted upon completion of the step (i.e. you'd only see
# the connection instructions annotation posted once the integration tests are done)
- uses: jahia/jahia-modules-action/helper@v2
- uses: actions/checkout@v2
- uses: KengoTODA/actions-setup-docker-compose@main
with:
version: '1.29.2'
- uses: actions/setup-node@v2
with:
node-version: 'lts/*'
- uses: jahia/jahia-modules-action/integration-tests@v2
with:
module_id: richtext-configuration
testrail_project: Richtext Configuration Module
artifact_name: Integration-Tests-Standalone
tests_manifest: provisioning-manifest-build.yml
jahia_image: jahia/jahia-discovery-dev:8-SNAPSHOT
should_use_build_artifacts: true
github_artifact_name: jexp-standalone-artifacts-${{ github.run_number }}
bastion_ssh_private_key: ${{ secrets.BASTION_SSH_PRIVATE_KEY_JAHIACI }}
jahia_license: ${{ secrets.JAHIA_LICENSE_8X_FULL }}
docker_username: ${{ secrets.DOCKERHUB_USERNAME }}
docker_password: ${{ secrets.DOCKERHUB_PASSWORD }}
nexus_username: ${{ secrets.NEXUS_USERNAME }}
nexus_password: ${{ secrets.NEXUS_PASSWORD }}
# Test report is useful when posting annotation if multiple similar jobs are performed
# For example, there could be one report for standalone and one report for cluster test
# It is not needed if there is only one type of integration tests within the workflow
tests_report_name: Test report (Standalone)
testrail_username: ${{ secrets.TESTRAIL_USERNAME }}
testrail_password: ${{ secrets.TESTRAIL_PASSWORD }}
incident_pagerduty_api_key: ${{ secrets.INCIDENT_PAGERDUTY_API_KEY }}
incident_pagerduty_reporter_email: ${{ secrets.INCIDENT_PAGERDUTY_REPORTER_EMAIL }}
incident_pagerduty_reporter_id: ${{ secrets.INCIDENT_PAGERDUTY_REPORTER_ID }}
incident_google_spreadsheet_id: ${{ secrets.INCIDENT_GOOGLE_SPREADSHEET_ID }}
incident_google_client_email: ${{ secrets.INCIDENT_GOOGLE_CLIENT_EMAIL }}
incident_google_api_key_base64: ${{ secrets.INCIDENT_GOOGLE_API_KEY_BASE64 }}
zencrepes_secret: ${{ secrets.ZENCREPES_WEBHOOK_SECRET }}
- name: Test Report
uses: dorny/test-reporter@v1
if: success() || failure()
with:
name: Tests Report (Standalone)
path: tests/artifacts/results/xml_reports/*.xml
reporter: java-junit
fail-on-error: 'false'

# Using cluster tests might require a particular setup (i.e. with the use of a reverse proxy)
# Such configuration is handled directly by the repo executing the tests, the commented snippet
# below is only there to highlight differences with the standalone tests
# integration-tests-cluster:
# name: Integration Tests (Cluster)
# needs: build
# runs-on: self-hosted
# timeout-minutes: 45
# steps:
# - uses: jahia/jahia-modules-action/helper@v2
# - uses: actions/checkout@v2
# - uses: jahia/jahia-modules-action/integration-tests@v2
# with:
# module_id: sitmap
# testrail_project: Sitemap Module
# artifact_name: Integration-Tests-Cluster
# tests_manifest: provisioning-manifest-build.yml
# jahia_image: jahia/jahia-ee:8
# jahia_cluster_enabled: true
# should_use_build_artifacts: true
# jahia_license: ${{ secrets.JAHIA_LICENSE_8X_FULL }}
# docker_username: ${{ secrets.DOCKERHUB_USERNAME }}
# docker_password: ${{ secrets.DOCKERHUB_PASSWORD }}
# nexus_username: ${{ secrets.NEXUS_USERNAME }}
# nexus_password: ${{ secrets.NEXUS_PASSWORD }}
# tests_report_name: Test report (Cluster)
# testrail_username: ${{ secrets.TESTRAIL_USERNAME }}
# testrail_password: ${{ secrets.TESTRAIL_PASSWORD }}
# incident_pagerduty_api_key: ${{ secrets.INCIDENT_PAGERDUTY_API_KEY }}
# incident_pagerduty_reporter_email: ${{ secrets.INCIDENT_PAGERDUTY_REPORTER_EMAIL }}
# incident_pagerduty_reporter_id: ${{ secrets.INCIDENT_PAGERDUTY_REPORTER_ID }}
# incident_google_spreadsheet_id: ${{ secrets.INCIDENT_GOOGLE_SPREADSHEET_ID }}
# incident_google_client_email: ${{ secrets.INCIDENT_GOOGLE_CLIENT_EMAIL }}
# incident_google_api_key_base64: ${{ secrets.INCIDENT_GOOGLE_API_KEY_BASE64 }}
# zencrepes_secret: ${{ secrets.ZENCREPES_WEBHOOK_SECRET }}

# Tmate only starts if any of the previous steps fails.
# Be careful since it also means that if a step fails the workflow will
# keep running until it reaches the timeout.
# Tmate is only useful with github-hosted runners. With self-hosted runners
# you can SSH directly into the running using instructions provided by the helper
# - name: Setup tmate session
# if: ${{ failure() }}
# uses: mxschmitt/action-tmate@v3
# timeout-minutes: 15
# integration-tests:
# name: Integration Tests
# needs: build
# # Use self-hosted if you want to run on our own runners
# # you would typically want to use self-hosted runners for integration tests
# runs-on: self-hosted
# # Timeout is important as it forces the job to fail if it hangs for any reason,
# # If not specified it will be left running until workflow run limit is reached (72h)
# timeout-minutes: 45
# steps:
# # The helper is used to print instructions, such as how to connect to the runner.
# # It should be defined as a workflow step (vs a step in an action itself) since some
# # annotations are only posted upon completion of the step (i.e. you'd only see
# # the connection instructions annotation posted once the integration tests are done)
# - uses: jahia/jahia-modules-action/helper@v2
# - uses: actions/checkout@v2
# - uses: KengoTODA/actions-setup-docker-compose@main
# with:
# version: '1.29.2'
# - uses: actions/setup-node@v2
# with:
# node-version: 'lts/*'
# - uses: jahia/jahia-modules-action/integration-tests@v2
# with:
# module_id: richtext-configuration
# testrail_project: Richtext Configuration Module
# artifact_name: Integration-Tests-Standalone
# tests_manifest: provisioning-manifest-build.yml
# jahia_image: jahia/jahia-discovery-dev:8-SNAPSHOT
# should_use_build_artifacts: true
# github_artifact_name: jexp-standalone-artifacts-${{ github.run_number }}
# bastion_ssh_private_key: ${{ secrets.BASTION_SSH_PRIVATE_KEY_JAHIACI }}
# jahia_license: ${{ secrets.JAHIA_LICENSE_8X_FULL }}
# docker_username: ${{ secrets.DOCKERHUB_USERNAME }}
# docker_password: ${{ secrets.DOCKERHUB_PASSWORD }}
# nexus_username: ${{ secrets.NEXUS_USERNAME }}
# nexus_password: ${{ secrets.NEXUS_PASSWORD }}
# # Test report is useful when posting annotation if multiple similar jobs are performed
# # For example, there could be one report for standalone and one report for cluster test
# # It is not needed if there is only one type of integration tests within the workflow
# tests_report_name: Test report (Standalone)
# testrail_username: ${{ secrets.TESTRAIL_USERNAME }}
# testrail_password: ${{ secrets.TESTRAIL_PASSWORD }}
# incident_pagerduty_api_key: ${{ secrets.INCIDENT_PAGERDUTY_API_KEY }}
# incident_pagerduty_reporter_email: ${{ secrets.INCIDENT_PAGERDUTY_REPORTER_EMAIL }}
# incident_pagerduty_reporter_id: ${{ secrets.INCIDENT_PAGERDUTY_REPORTER_ID }}
# incident_google_spreadsheet_id: ${{ secrets.INCIDENT_GOOGLE_SPREADSHEET_ID }}
# incident_google_client_email: ${{ secrets.INCIDENT_GOOGLE_CLIENT_EMAIL }}
# incident_google_api_key_base64: ${{ secrets.INCIDENT_GOOGLE_API_KEY_BASE64 }}
# zencrepes_secret: ${{ secrets.ZENCREPES_WEBHOOK_SECRET }}
# - name: Test Report
# uses: dorny/test-reporter@v1
# if: success() || failure()
# with:
# name: Tests Report (Standalone)
# path: tests/artifacts/results/xml_reports/*.xml
# reporter: java-junit
# fail-on-error: 'false'
#
# # Using cluster tests might require a particular setup (i.e. with the use of a reverse proxy)
# # Such configuration is handled directly by the repo executing the tests, the commented snippet
# # below is only there to highlight differences with the standalone tests
# # integration-tests-cluster:
# # name: Integration Tests (Cluster)
# # needs: build
# # runs-on: self-hosted
# # timeout-minutes: 45
# # steps:
# # - uses: jahia/jahia-modules-action/helper@v2
# # - uses: actions/checkout@v2
# # - uses: jahia/jahia-modules-action/integration-tests@v2
# # with:
# # module_id: sitmap
# # testrail_project: Sitemap Module
# # artifact_name: Integration-Tests-Cluster
# # tests_manifest: provisioning-manifest-build.yml
# # jahia_image: jahia/jahia-ee:8
# # jahia_cluster_enabled: true
# # should_use_build_artifacts: true
# # jahia_license: ${{ secrets.JAHIA_LICENSE_8X_FULL }}
# # docker_username: ${{ secrets.DOCKERHUB_USERNAME }}
# # docker_password: ${{ secrets.DOCKERHUB_PASSWORD }}
# # nexus_username: ${{ secrets.NEXUS_USERNAME }}
# # nexus_password: ${{ secrets.NEXUS_PASSWORD }}
# # tests_report_name: Test report (Cluster)
# # testrail_username: ${{ secrets.TESTRAIL_USERNAME }}
# # testrail_password: ${{ secrets.TESTRAIL_PASSWORD }}
# # incident_pagerduty_api_key: ${{ secrets.INCIDENT_PAGERDUTY_API_KEY }}
# # incident_pagerduty_reporter_email: ${{ secrets.INCIDENT_PAGERDUTY_REPORTER_EMAIL }}
# # incident_pagerduty_reporter_id: ${{ secrets.INCIDENT_PAGERDUTY_REPORTER_ID }}
# # incident_google_spreadsheet_id: ${{ secrets.INCIDENT_GOOGLE_SPREADSHEET_ID }}
# # incident_google_client_email: ${{ secrets.INCIDENT_GOOGLE_CLIENT_EMAIL }}
# # incident_google_api_key_base64: ${{ secrets.INCIDENT_GOOGLE_API_KEY_BASE64 }}
# # zencrepes_secret: ${{ secrets.ZENCREPES_WEBHOOK_SECRET }}
#
# # Tmate only starts if any of the previous steps fails.
# # Be careful since it also means that if a step fails the workflow will
# # keep running until it reaches the timeout.
# # Tmate is only useful with github-hosted runners. With self-hosted runners
# # you can SSH directly into the running using instructions provided by the helper
# # - name: Setup tmate session
# # if: ${{ failure() }}
# # uses: mxschmitt/action-tmate@v3
# # timeout-minutes: 15
116 changes: 58 additions & 58 deletions .github/workflows/on-merge.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,66 +47,66 @@ jobs:
with:
module_id: richtext-configuration

sbom:
name: SBOM processing
needs: build
runs-on: ubuntu-latest
container:
image: cyclonedx/cyclonedx-cli:0.24.2
steps:
- uses: jahia/jahia-modules-action/sbom-processing@v2
with:
dependencytrack_hostname: ${{ vars.DEPENDENCYTRACK_HOSTNAME }}
dependencytrack_apikey: ${{ secrets.DEPENDENCYTRACK_APIKEY }}
sbom_artifacts: 'build-artifacts'
# sbom:
# name: SBOM processing
# needs: build
# runs-on: ubuntu-latest
# container:
# image: cyclonedx/cyclonedx-cli:0.24.2
# steps:
# - uses: jahia/jahia-modules-action/sbom-processing@v2
# with:
# dependencytrack_hostname: ${{ vars.DEPENDENCYTRACK_HOSTNAME }}
# dependencytrack_apikey: ${{ secrets.DEPENDENCYTRACK_APIKEY }}
# sbom_artifacts: 'build-artifacts'

# Please see "on-code-change.yml" for instructions on integration-tests
integration-tests-standalone:
name: Integration Tests (Standalone)
needs: build
runs-on: ubuntu-latest
timeout-minutes: 45
steps:
- uses: jahia/jahia-modules-action/helper@v2
- uses: actions/checkout@v2
- uses: KengoTODA/actions-setup-docker-compose@main
with:
version: '1.29.2'
- uses: actions/setup-node@v2
with:
node-version: 'lts/*'
- uses: jahia/jahia-modules-action/integration-tests@v2
with:
module_id: richtext-configuration
testrail_project: Richtext Configuration Module
tests_manifest: provisioning-manifest-build.yml
jahia_image: jahia/jahia-discovery-dev:8-SNAPSHOT
should_use_build_artifacts: true
github_artifact_name: richtext-configuration-standalone-artifacts-${{ github.run_number }}
bastion_ssh_private_key: ${{ secrets.BASTION_SSH_PRIVATE_KEY_JAHIACI }}
jahia_license: ${{ secrets.JAHIA_LICENSE_8X_FULL }}
docker_username: ${{ secrets.DOCKERHUB_USERNAME }}
docker_password: ${{ secrets.DOCKERHUB_PASSWORD }}
nexus_username: ${{ secrets.NEXUS_USERNAME }}
nexus_password: ${{ secrets.NEXUS_PASSWORD }}
tests_report_name: Test report (Standalone)
testrail_username: ${{ secrets.TESTRAIL_USERNAME }}
testrail_password: ${{ secrets.TESTRAIL_PASSWORD }}
incident_pagerduty_api_key: ${{ secrets.INCIDENT_PAGERDUTY_API_KEY }}
incident_pagerduty_reporter_email: ${{ secrets.INCIDENT_PAGERDUTY_REPORTER_EMAIL }}
incident_pagerduty_reporter_id: ${{ secrets.INCIDENT_PAGERDUTY_REPORTER_ID }}
incident_google_spreadsheet_id: ${{ secrets.INCIDENT_GOOGLE_SPREADSHEET_ID }}
incident_google_client_email: ${{ secrets.INCIDENT_GOOGLE_CLIENT_EMAIL }}
incident_google_api_key_base64: ${{ secrets.INCIDENT_GOOGLE_API_KEY_BASE64 }}
zencrepes_secret: ${{ secrets.ZENCREPES_WEBHOOK_SECRET }}
- name: Test Report
uses: dorny/test-reporter@v1
if: success() || failure()
with:
name: Tests Report (Standalone)
path: tests/artifacts/results/xml_reports/*.xml
reporter: java-junit
fail-on-error: 'false'
# integration-tests-standalone:
# name: Integration Tests (Standalone)
# needs: build
# runs-on: ubuntu-latest
# timeout-minutes: 45
# steps:
# - uses: jahia/jahia-modules-action/helper@v2
# - uses: actions/checkout@v2
# - uses: KengoTODA/actions-setup-docker-compose@main
# with:
# version: '1.29.2'
# - uses: actions/setup-node@v2
# with:
# node-version: 'lts/*'
# - uses: jahia/jahia-modules-action/integration-tests@v2
# with:
# module_id: richtext-configuration
# testrail_project: Richtext Configuration Module
# tests_manifest: provisioning-manifest-build.yml
# jahia_image: jahia/jahia-discovery-dev:8-SNAPSHOT
# should_use_build_artifacts: true
# github_artifact_name: richtext-configuration-standalone-artifacts-${{ github.run_number }}
# bastion_ssh_private_key: ${{ secrets.BASTION_SSH_PRIVATE_KEY_JAHIACI }}
# jahia_license: ${{ secrets.JAHIA_LICENSE_8X_FULL }}
# docker_username: ${{ secrets.DOCKERHUB_USERNAME }}
# docker_password: ${{ secrets.DOCKERHUB_PASSWORD }}
# nexus_username: ${{ secrets.NEXUS_USERNAME }}
# nexus_password: ${{ secrets.NEXUS_PASSWORD }}
# tests_report_name: Test report (Standalone)
# testrail_username: ${{ secrets.TESTRAIL_USERNAME }}
# testrail_password: ${{ secrets.TESTRAIL_PASSWORD }}
# incident_pagerduty_api_key: ${{ secrets.INCIDENT_PAGERDUTY_API_KEY }}
# incident_pagerduty_reporter_email: ${{ secrets.INCIDENT_PAGERDUTY_REPORTER_EMAIL }}
# incident_pagerduty_reporter_id: ${{ secrets.INCIDENT_PAGERDUTY_REPORTER_ID }}
# incident_google_spreadsheet_id: ${{ secrets.INCIDENT_GOOGLE_SPREADSHEET_ID }}
# incident_google_client_email: ${{ secrets.INCIDENT_GOOGLE_CLIENT_EMAIL }}
# incident_google_api_key_base64: ${{ secrets.INCIDENT_GOOGLE_API_KEY_BASE64 }}
# zencrepes_secret: ${{ secrets.ZENCREPES_WEBHOOK_SECRET }}
# - name: Test Report
# uses: dorny/test-reporter@v1
# if: success() || failure()
# with:
# name: Tests Report (Standalone)
# path: tests/artifacts/results/xml_reports/*.xml
# reporter: java-junit
# fail-on-error: 'false'

publish:
name: Publish module
Expand Down

0 comments on commit 8db8886

Please sign in to comment.