From 96a31f11eab90f9814417742b7e3ef6d733679b0 Mon Sep 17 00:00:00 2001 From: sagnard Date: Wed, 3 Apr 2024 16:31:45 +0200 Subject: [PATCH 1/5] BACKLOG-22478 : fix provisionning --- .github/workflows/nightly-jahiaRelease.yml | 2 +- tests/provisioning-manifest-81x.yml | 24 ++++++++++++++++++++++ tests/provisioning-manifest-snapshot.yml | 7 ++++--- 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 tests/provisioning-manifest-81x.yml diff --git a/.github/workflows/nightly-jahiaRelease.yml b/.github/workflows/nightly-jahiaRelease.yml index a1d243c..8f9934b 100644 --- a/.github/workflows/nightly-jahiaRelease.yml +++ b/.github/workflows/nightly-jahiaRelease.yml @@ -27,7 +27,7 @@ jobs: incident_service: siteSettings-JahiaRL timeout_minutes: 20 testrail_project: Site Settings Module - tests_manifest: provisioning-manifest-snapshot.yml + tests_manifest: provisioning-manifest-81x.yml jahia_image: jahia/jahia-ee:8 should_use_build_artifacts: false should_skip_artifacts: true diff --git a/tests/provisioning-manifest-81x.yml b/tests/provisioning-manifest-81x.yml new file mode 100644 index 0000000..c5dc136 --- /dev/null +++ b/tests/provisioning-manifest-81x.yml @@ -0,0 +1,24 @@ +- addMavenRepository: 'https://devtools.jahia.com/nexus/content/groups/internal@id=jahia-internal@snapshots' + username: ${env:NEXUS_USERNAME} + password: ${env:NEXUS_PASSWORD} + +- installBundle: + - 'mvn:org.jahia.modules/press/3.1.0' + - 'mvn:org.jahia.modules/person/3.2.0' + - 'mvn:org.jahia.modules/news/3.4.0' + - 'mvn:org.jahia.modules/font-awesome/6.1.5' + - 'mvn:org.jahia.modules/calendar/3.2.0' + - 'mvn:org.jahia.modules/bootstrap3-core/4.2.0' + - 'mvn:org.jahia.modules/bootstrap3-components/4.2.0' + - 'mvn:org.jahia.modules/location/3.2.0' + - 'mvn:org.jahia.modules/topstories/3.0.0' + - 'mvn:org.jahia.modules/rating/3.2.0' + - 'mvn:org.jahia.modules/event/3.1.0' + - 'mvn:org.jahia.modules/bookmarks/3.1.0' + - 'mvn:org.jahia.modules/dx-base-demo-core/2.3.0' + - 'mvn:org.jahia.modules/dx-base-demo-templates/3.1.0' + - 'mvn:org.jahia.modules/dx-base-demo-components/2.2.0' + - 'mvn:org.jahia.modules/digitall/2.3.0' + - 'mvn:org.jahia.modules/siteSettings' + autoStart: true + uninstallPreviousVersion: true diff --git a/tests/provisioning-manifest-snapshot.yml b/tests/provisioning-manifest-snapshot.yml index c5dc136..b173e47 100644 --- a/tests/provisioning-manifest-snapshot.yml +++ b/tests/provisioning-manifest-snapshot.yml @@ -3,6 +3,7 @@ password: ${env:NEXUS_PASSWORD} - installBundle: + - 'mvn:org.jahia.modules/legacy-default-components/1.0.0-SNAPSHOT' - 'mvn:org.jahia.modules/press/3.1.0' - 'mvn:org.jahia.modules/person/3.2.0' - 'mvn:org.jahia.modules/news/3.4.0' @@ -16,9 +17,9 @@ - 'mvn:org.jahia.modules/event/3.1.0' - 'mvn:org.jahia.modules/bookmarks/3.1.0' - 'mvn:org.jahia.modules/dx-base-demo-core/2.3.0' - - 'mvn:org.jahia.modules/dx-base-demo-templates/3.1.0' - - 'mvn:org.jahia.modules/dx-base-demo-components/2.2.0' - - 'mvn:org.jahia.modules/digitall/2.3.0' + - 'mvn:org.jahia.modules/dx-base-demo-templates/4.0.0-SNAPSHOT' + - 'mvn:org.jahia.modules/dx-base-demo-components/3.0.0-SNAPSHOT' + - 'mvn:org.jahia.modules/digitall/3.0.0-SNAPSHOT' - 'mvn:org.jahia.modules/siteSettings' autoStart: true uninstallPreviousVersion: true From a352fd97f03e79f9460b3874a56e5e318d5d4b30 Mon Sep 17 00:00:00 2001 From: Francois G Date: Wed, 3 Apr 2024 18:00:12 +0200 Subject: [PATCH 2/5] Updated build script, removed unnecessary 81x script --- tests/provisioning-manifest-81x.yml | 24 ------------------------ tests/provisioning-manifest-build.yml | 7 ++++--- 2 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 tests/provisioning-manifest-81x.yml diff --git a/tests/provisioning-manifest-81x.yml b/tests/provisioning-manifest-81x.yml deleted file mode 100644 index c5dc136..0000000 --- a/tests/provisioning-manifest-81x.yml +++ /dev/null @@ -1,24 +0,0 @@ -- addMavenRepository: 'https://devtools.jahia.com/nexus/content/groups/internal@id=jahia-internal@snapshots' - username: ${env:NEXUS_USERNAME} - password: ${env:NEXUS_PASSWORD} - -- installBundle: - - 'mvn:org.jahia.modules/press/3.1.0' - - 'mvn:org.jahia.modules/person/3.2.0' - - 'mvn:org.jahia.modules/news/3.4.0' - - 'mvn:org.jahia.modules/font-awesome/6.1.5' - - 'mvn:org.jahia.modules/calendar/3.2.0' - - 'mvn:org.jahia.modules/bootstrap3-core/4.2.0' - - 'mvn:org.jahia.modules/bootstrap3-components/4.2.0' - - 'mvn:org.jahia.modules/location/3.2.0' - - 'mvn:org.jahia.modules/topstories/3.0.0' - - 'mvn:org.jahia.modules/rating/3.2.0' - - 'mvn:org.jahia.modules/event/3.1.0' - - 'mvn:org.jahia.modules/bookmarks/3.1.0' - - 'mvn:org.jahia.modules/dx-base-demo-core/2.3.0' - - 'mvn:org.jahia.modules/dx-base-demo-templates/3.1.0' - - 'mvn:org.jahia.modules/dx-base-demo-components/2.2.0' - - 'mvn:org.jahia.modules/digitall/2.3.0' - - 'mvn:org.jahia.modules/siteSettings' - autoStart: true - uninstallPreviousVersion: true diff --git a/tests/provisioning-manifest-build.yml b/tests/provisioning-manifest-build.yml index b5c2341..e952941 100644 --- a/tests/provisioning-manifest-build.yml +++ b/tests/provisioning-manifest-build.yml @@ -3,6 +3,7 @@ password: ${env:NEXUS_PASSWORD} - installBundle: + - 'mvn:org.jahia.modules/legacy-default-components/1.0.0-SNAPSHOT' - 'mvn:org.jahia.modules/press/3.1.0' - 'mvn:org.jahia.modules/person/3.2.0' - 'mvn:org.jahia.modules/news/3.4.0' @@ -16,8 +17,8 @@ - 'mvn:org.jahia.modules/event/3.1.0' - 'mvn:org.jahia.modules/bookmarks/3.1.0' - 'mvn:org.jahia.modules/dx-base-demo-core/2.3.0' - - 'mvn:org.jahia.modules/dx-base-demo-templates/3.1.0' - - 'mvn:org.jahia.modules/dx-base-demo-components/2.2.0' - - 'mvn:org.jahia.modules/digitall/2.3.0' + - 'mvn:org.jahia.modules/dx-base-demo-templates/4.0.0-SNAPSHOT' + - 'mvn:org.jahia.modules/dx-base-demo-components/3.0.0-SNAPSHOT' + - 'mvn:org.jahia.modules/digitall/3.0.0-SNAPSHOT' autoStart: true uninstallPreviousVersion: true From 7412f10553e41c245e2c7bf499ce515a97f240fc Mon Sep 17 00:00:00 2001 From: sagnard Date: Wed, 3 Apr 2024 22:08:19 +0200 Subject: [PATCH 3/5] change credentials variable --- tests/provisioning-manifest-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/provisioning-manifest-build.yml b/tests/provisioning-manifest-build.yml index e952941..35ec672 100644 --- a/tests/provisioning-manifest-build.yml +++ b/tests/provisioning-manifest-build.yml @@ -1,6 +1,6 @@ - addMavenRepository: 'https://devtools.jahia.com/nexus/content/groups/internal@id=jahia-internal@snapshots' - username: ${env:NEXUS_USERNAME} - password: ${env:NEXUS_PASSWORD} + username: NEXUS_USERNAME + password: NEXUS_PASSWORD - installBundle: - 'mvn:org.jahia.modules/legacy-default-components/1.0.0-SNAPSHOT' From c14a05073c43c075bd2c2a8275b34d1b1456ba31 Mon Sep 17 00:00:00 2001 From: sagnard Date: Wed, 3 Apr 2024 22:26:50 +0200 Subject: [PATCH 4/5] revert previous commit --- tests/provisioning-manifest-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/provisioning-manifest-build.yml b/tests/provisioning-manifest-build.yml index 35ec672..e952941 100644 --- a/tests/provisioning-manifest-build.yml +++ b/tests/provisioning-manifest-build.yml @@ -1,6 +1,6 @@ - addMavenRepository: 'https://devtools.jahia.com/nexus/content/groups/internal@id=jahia-internal@snapshots' - username: NEXUS_USERNAME - password: NEXUS_PASSWORD + username: ${env:NEXUS_USERNAME} + password: ${env:NEXUS_PASSWORD} - installBundle: - 'mvn:org.jahia.modules/legacy-default-components/1.0.0-SNAPSHOT' From 088f7d4799d7c102d351b3a64a2211e098328dec Mon Sep 17 00:00:00 2001 From: Francois G Date: Thu, 4 Apr 2024 09:03:15 +0200 Subject: [PATCH 5/5] TECH-1611: Added skins and default-skins modules --- tests/provisioning-manifest-build.yml | 2 ++ tests/provisioning-manifest-snapshot.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/provisioning-manifest-build.yml b/tests/provisioning-manifest-build.yml index e952941..ae48499 100644 --- a/tests/provisioning-manifest-build.yml +++ b/tests/provisioning-manifest-build.yml @@ -20,5 +20,7 @@ - 'mvn:org.jahia.modules/dx-base-demo-templates/4.0.0-SNAPSHOT' - 'mvn:org.jahia.modules/dx-base-demo-components/3.0.0-SNAPSHOT' - 'mvn:org.jahia.modules/digitall/3.0.0-SNAPSHOT' + - 'mvn:org.jahia.modules/skins' + - 'mvn:org.jahia.modules/default-skins' autoStart: true uninstallPreviousVersion: true diff --git a/tests/provisioning-manifest-snapshot.yml b/tests/provisioning-manifest-snapshot.yml index b173e47..42b841d 100644 --- a/tests/provisioning-manifest-snapshot.yml +++ b/tests/provisioning-manifest-snapshot.yml @@ -20,6 +20,8 @@ - 'mvn:org.jahia.modules/dx-base-demo-templates/4.0.0-SNAPSHOT' - 'mvn:org.jahia.modules/dx-base-demo-components/3.0.0-SNAPSHOT' - 'mvn:org.jahia.modules/digitall/3.0.0-SNAPSHOT' + - 'mvn:org.jahia.modules/skins' + - 'mvn:org.jahia.modules/default-skins' - 'mvn:org.jahia.modules/siteSettings' autoStart: true uninstallPreviousVersion: true