CIF-2161: align venia with wknd

.circleci/ci/deploy-venia.js

@@ -31,12 +31,10 @@ ci.sh("chmod +x ghr");
 
 ci.sh("mkdir -p artifacts"); // target folder for all the build artifacts
 
-let profiles = ['cloud', 'classic'];
-profiles.forEach(profile => {
-    ci.stage(`Build and install Venia '${profile}'`);
-    ci.sh(`mvn clean install -P${profile}`);
-    ci.sh(`cp all/target/${releaseArtifact}.all-${releaseVersion}-${profile}.zip artifacts`);
-})
+ci.stage(`Build and install Venia`);
+ci.sh(`mvn -B clean install -PwithClassic`);
+ci.sh(`cp all/target/${releaseArtifact}.all-${releaseVersion}.zip artifacts/${releaseArtifact}.all-${releaseVersion}.zip`);
+ci.sh(`cp classic/all/target/${releaseArtifact}.all-classic-${releaseVersion}.zip artifacts/${releaseArtifact}.all-${releaseVersion}-classic.zip`);
 
 ci.stage("Deploy Venia Sample Project to GitHub");
 ci.sh(`./ghr -t ${ci.env("GITHUB_TOKEN")} \

.circleci/ci/it-tests.js

@@ -39,11 +39,13 @@ try {
 
             // The core components are already installed in the Cloud SDK
             extras += ` --bundle com.adobe.cq:core.wcm.components.all:${wcmVersion}:zip`;
+            extras += ` --install-file ${buildPath}/classic/all/target/aem-cif-guides-venia.all-classic-${veniaVersion}.zip`
 
         } else if (classifier == 'cloud') {
             // Download latest add-on release from artifactory
             ci.sh(`mvn -s ${buildPath}/.circleci/settings.xml com.googlecode.maven-download-plugin:download-maven-plugin:1.6.3:artifact -Partifactory-cloud -DgroupId=com.adobe.cq.cif -DartifactId=cif-cloud-ready-feature-pkg -Dversion=LATEST -Dtype=far -Dclassifier=cq-commerce-addon-authorfar -DoutputDirectory=${buildPath}/dependencies -DoutputFileName=addon.far`);
             extras = ` --install-file ${buildPath}/dependencies/addon.far`;
+            extras += ` --install-file ${buildPath}/all/target/aem-cif-guides-venia.all-${veniaVersion}.zip`
         }
 
         // Install SNAPSHOT or current version of CIF examples bundle
@@ -58,14 +60,13 @@ try {
         ci.sh(`./qp.sh -v start --id author --runmode author --port 4502 --qs-jar /home/circleci/cq/author/cq-quickstart.jar \
             --bundle org.apache.sling:org.apache.sling.junit.core:1.0.23:jar \
             ${extras} \
-            --install-file ${buildPath}/all/target/venia.all-${veniaVersion}-${classifier}.zip \
             --vm-options \\\"-Xmx1536m -XX:MaxPermSize=256m -Djava.awt.headless=true -javaagent:${process.env.JACOCO_AGENT}=destfile=crx-quickstart/jacoco-it.exec\\\"`);
     });
 
     // Run integration tests
     if (TYPE === 'integration') {
         ci.dir('it.tests', () => {
-            ci.sh(`mvn clean verify -U -B -Plocal,${classifier}`); // The -Plocal profile comes from the AEM archetype 
+            ci.sh(`mvn clean verify -U -B -Plocal`); // The -Plocal profile comes from the AEM archetype
         });
     }
     if (TYPE === 'selenium') {

.circleci/config.yml

@@ -9,8 +9,8 @@ common:
       - checkout
       - restore_cache:
           keys:
-            - maven-repo-v2-<< parameters.classifier >>-its-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
-            - maven-repo-v2-<< parameters.classifier >>-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
+            - maven-repo-v2-its-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
+            - maven-repo-v2-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
       - attach_workspace:
           at: /home/circleci/build
       - run:
@@ -19,7 +19,7 @@ common:
       - save_cache:
           paths:
             - ~/.m2
-          key: maven-repo-v2-<< parameters.classifier >>-its-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
+          key: maven-repo-v2-its-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
       - store_test_results:
           path: test-reports
       # Save test results as artifacts
@@ -80,8 +80,6 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - maven-repo-v2-cloud-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
-            - maven-repo-v2-cloud
             - maven-repo-v2-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
             - maven-repo-v2-
       - run:
@@ -94,18 +92,19 @@ jobs:
             java -version
             mvn -v
             if [[ "$CIRCLE_BRANCH" != "" && "$CIRCLE_BRANCH" != "main" ]]; then
-              mvn -B clean install -Pcloud,fedDev
+              mvn -B clean install -PfedDev,withClassic
             else
-              mvn -B clean install
+              mvn -B clean install -PwithClassic
             fi
       - save_cache:
           paths:
             - ~/.m2
-          key: maven-repo-v2-cloud-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
+          key: maven-repo-v2-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
       - persist_to_workspace:
           root: /home/circleci/build
           paths:
             - all/target/*.zip
+            - classic/all/target/*.zip
             - dependencies/aem-core-cif-components/examples/bundle/target/*.jar
       - store_test_results:
           path: core/target/surefire-reports
@@ -114,41 +113,6 @@ jobs:
       - codecov/upload:
           flags: unittests
 
-  build-classic:
-    executor: cif_executor
-    working_directory: /home/circleci/build
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - maven-repo-v2-classic-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
-            - maven-repo-v2-classic-
-            - maven-repo-v2-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
-            - maven-repo-v2-
-      - run:
-          name: Update permissions
-          command: sudo chown -R circleci /usr/local/lib/node_modules
-      - *install_components
-      - run:
-          name: Build
-          command: |
-            java -version
-            mvn -v
-            if [[ "$CIRCLE_BRANCH" != "" && "$CIRCLE_BRANCH" != "main" ]]; then
-              mvn -B clean install -Pclassic,fedDev
-            else
-              mvn -B clean install -Pclassic
-            fi
-      - save_cache:
-          paths:
-            - ~/.m2
-          key: maven-repo-v2-classic-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
-      - persist_to_workspace:
-          root: /home/circleci/build
-          paths:
-            - all/target/*.zip
-            - dependencies/aem-core-cif-components/examples/bundle/target/*.jar
-
   integration-test-655:
     executor: test_executor_655
     environment:
@@ -212,8 +176,6 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - maven-repo-v2-cloud-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
-            - maven-repo-v2-cloud-
             - maven-repo-v2-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
             - maven-repo-v2-
       - run:
@@ -230,20 +192,14 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - build-classic:
-          context:
-            - CIF Artifactory Cloud
-          filters:
-            tags:
-              only: /.*/
       - integration-test-655:
           context:
             - CIF Artifactory Cloud
           filters:
             tags:
               only: /.*/
           requires:
-            - build-classic
+            - build
       - integration-test-cloudready-with-addon:
           context:
             - CIF Artifactory Cloud
@@ -267,14 +223,13 @@ workflows:
             tags:
               only: /.*/
           requires:
-            - build-classic
+            - build
       - deploy-sample:
           context:
             - CIF Artifactory Cloud
             - CIF GitHub
           requires:
             - build
-            - build-classic
           filters:
             branches:
               ignore: /.*/

.gitignore

@@ -100,10 +100,6 @@ node/
 # Tests
 coverage/
 
-# Generated files for the 'cloud' and 'classic' profiles
-ui.content/src/main/content/jcr_root/conf/venia/settings/cloudconfigs/commerce/.content.xml
-ui.content/src/main/content/META-INF/vault/filter.xml
-
 # UI Tests
 ui.tests/test-module/reports
 test-reports

README.md

@@ -174,7 +174,7 @@ The project comes with the auto-public repository configured. To set up the repo
 
 The Venia demo is only released on Github but not on Maven Central like other projects like the CIF components. To perform a release, we use a dedicated profile to make sure all modules versions are updated:
 
-`mvn release:prepare release:clean -Prelease-prepare`
+`mvn release:prepare release:clean`
 
 Releases must be done on the `main` branch.