#1 🔧 working on CI build process with test.pypi.org config and downst…

…ream helm chart url fix
boozallen · May 9, 2024 · d0c0d61 · d0c0d61
1 parent f0f4b3a
commit d0c0d61
Show file tree

Hide file tree

Showing 26 changed files with 53 additions and 30 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -28,7 +28,7 @@
         <version.failsafe.plugin>${version.maven.surefire.plugin}</version.failsafe.plugin>
         <version.fermenter>2.10.2</version.fermenter>
         <version.fermenter.legacy.tools>2.8.0</version.fermenter.legacy.tools>
-        <version.habushu.plugin>2.13.1</version.habushu.plugin>
+        <version.habushu.plugin>2.14.0</version.habushu.plugin>
         <version.python>3.11.4</version.python>
         <version.help.plugin>3.2.0</version.help.plugin>
         <version.krausening>19</version.krausening>
@@ -487,6 +487,8 @@
                                 <operatorAndVersion>~${version.sedona}</operatorAndVersion>
                             </packageDefinition>
                         </managedDependencies>
+                        <sourceFailOnLintErrors>false</sourceFailOnLintErrors>
+                        <testFailOnLintErrors>false</testFailOnLintErrors>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -928,6 +930,7 @@ To suppress enforce-helm-version rule, you must add following plugin to the root
                                 <decryptPassword>false</decryptPassword>
                                 <rewriteLocalPathDepsInArchives>true</rewriteLocalPathDepsInArchives>
                                 <addPypiRepoAsPackageSources>false</addPypiRepoAsPackageSources>
+                                <useDevRepository>true</useDevRepository>
                             </configuration>
                         </plugin>
                         <plugin>
@@ -1032,6 +1035,24 @@ To suppress enforce-helm-version rule, you must add following plugin to the root
                 <hide.manual.actions>true</hide.manual.actions>
             </properties>
         </profile>
+        <profile>
+            <id>arm64</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.technologybrewery.habushu</groupId>
+                            <artifactId>habushu-maven-plugin</artifactId>
+                            <version>${version.habushu.plugin}</version>
+                            <configuration>
+                                <!-- we don't need to deploy "any" wheel artifacts twice: -->
+                                <skipDeploy>true</skipDeploy>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
     </profiles>
 
 </project>
diff --git a/docs/modules/ROOT/pages/maven-configuration.adoc b/docs/modules/ROOT/pages/maven-configuration.adoc
@@ -3,14 +3,16 @@
 = Configuring Maven
 
 == Install/Configure Maven
-To use the current version {page-version}, install Maven 3.9.x. For additional information on installing and/or updating Maven, please see the https://maven.apache.org/install.html[official Maven website,role=external,window=_blank].
+To use the current version {page-version}, install Maven 3.9.x. For additional information on installing and/or updating
+Maven, please see the https://maven.apache.org/install.html[official Maven website,role=external,window=_blank].
 
-Once the latest version of Maven is installed on your machine, follow the steps below to configure it for working with Solution Baseline artifacts.
+Once the latest version of Maven is installed on your machine, follow the steps below to configure it for
+working with Solution Baseline artifacts.
 
 === Private Maven Repository Configuration (OPTIONAL)
 The Maven `settings.xml` contains common configuration values you will use across all your Maven projects, often
 representing localized configurations.  This file is the best way to configure access to a remote Maven repository
-(https://maven.apache.org/settings.html)[see for more information the settings page of the official Maven
+https://maven.apache.org/settings.html[see for more information the settings page of the official Maven
 website,role=external,window=_blank].
 
 1.  Create a `settings.xml` file in the `.m2` directory within your user directory.

diff --git a/...n/foundation-mda/src/main/resources/templates/deployment/airflow/v2/airflow.chart.yaml.vm b/...n/foundation-mda/src/main/resources/templates/deployment/airflow/v2/airflow.chart.yaml.vm
@@ -31,5 +31,5 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-airflow-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
 
diff --git a/...tion-mda/src/main/resources/templates/deployment/data-access/v2/data.access.chart.yaml.vm b/...tion-mda/src/main/resources/templates/deployment/data-access/v2/data.access.chart.yaml.vm
@@ -31,5 +31,5 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-data-access-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
 
diff --git a/...urces/templates/deployment/elasticsearch-operator/v2/elasticsearch.operator.chart.yaml.vm b/...urces/templates/deployment/elasticsearch-operator/v2/elasticsearch.operator.chart.yaml.vm
@@ -31,4 +31,4 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-elasticsearch-operator-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
diff --git a/...-mda/src/main/resources/templates/deployment/elasticsearch/v2/elasticsearch.chart.yaml.vm b/...-mda/src/main/resources/templates/deployment/elasticsearch/v2/elasticsearch.chart.yaml.vm
@@ -31,4 +31,4 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-elasticsearch-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
diff --git a/.../main/resources/templates/deployment/hive-metastore-db/v2/hive.metastore.db.chart.yaml.vm b/.../main/resources/templates/deployment/hive-metastore-db/v2/hive.metastore.db.chart.yaml.vm
@@ -31,4 +31,4 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-hive-metastore-db-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
diff --git a/...urces/templates/deployment/hive-metastore-service/v2/hive-metastore-service-chart.yaml.vm b/...urces/templates/deployment/hive-metastore-service/v2/hive-metastore-service-chart.yaml.vm
@@ -31,4 +31,4 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-hive-metastore-service-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
diff --git a/...undation-mda/src/main/resources/templates/deployment/inference/v2/inference.chart.yaml.vm b/...undation-mda/src/main/resources/templates/deployment/inference/v2/inference.chart.yaml.vm
@@ -31,5 +31,5 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-inference-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
 
diff --git a/...n/foundation-mda/src/main/resources/templates/deployment/jenkins/v2/jenkins.chart.yaml.vm b/...n/foundation-mda/src/main/resources/templates/deployment/jenkins/v2/jenkins.chart.yaml.vm
@@ -31,5 +31,5 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-jenkins-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
 
diff --git a/...ation/foundation-mda/src/main/resources/templates/deployment/kafka/v2/kafka.chart.yaml.vm b/...ation/foundation-mda/src/main/resources/templates/deployment/kafka/v2/kafka.chart.yaml.vm
@@ -31,5 +31,5 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-kafka-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
 
diff --git a/...foundation-mda/src/main/resources/templates/deployment/keycloak/v2/keycloak.chart.yaml.vm b/...foundation-mda/src/main/resources/templates/deployment/keycloak/v2/keycloak.chart.yaml.vm
@@ -31,5 +31,5 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-keycloak-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
 
diff --git a/...ces/templates/deployment/lineage-custom-consumer/v2/lineage.custom.consumer.chart.yaml.vm b/...ces/templates/deployment/lineage-custom-consumer/v2/lineage.custom.consumer.chart.yaml.vm
@@ -31,4 +31,4 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-quarkus-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
diff --git a/...sources/templates/deployment/lineage-http-consumer/v2/lineage.http.consumer.chart.yaml.vm b/...sources/templates/deployment/lineage-http-consumer/v2/lineage.http.consumer.chart.yaml.vm
@@ -31,4 +31,4 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-lineage-http-consumer-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
diff --git a/...oundation-mda/src/main/resources/templates/deployment/localstack/localstack.chart.yaml.vm b/...oundation-mda/src/main/resources/templates/deployment/localstack/localstack.chart.yaml.vm
@@ -31,4 +31,4 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-localstack-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
diff --git a/...foundation-mda/src/main/resources/templates/deployment/metadata/v2/metadata.chart.yaml.vm b/...foundation-mda/src/main/resources/templates/deployment/metadata/v2/metadata.chart.yaml.vm
@@ -31,4 +31,4 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-metadata-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
diff --git a/...ion/foundation-mda/src/main/resources/templates/deployment/mlflow/v2/mlflow.chart.yaml.vm b/...ion/foundation-mda/src/main/resources/templates/deployment/mlflow/v2/mlflow.chart.yaml.vm
@@ -31,4 +31,4 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-mlflow-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
diff --git a/...lates/deployment/pipeline-invocation-service/v2/pipeline.invocation.service.chart.yaml.vm b/...lates/deployment/pipeline-invocation-service/v2/pipeline.invocation.service.chart.yaml.vm
@@ -31,7 +31,7 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-pipeline-invocation-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
   - name: aissemble-pipeline-invocation-lib-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
diff --git a/...sources/templates/deployment/policy-decision-point/v2/policy.decision.point.chart.yaml.vm b/...sources/templates/deployment/policy-decision-point/v2/policy.decision.point.chart.yaml.vm
@@ -31,4 +31,4 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-policy-decision-point-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
diff --git a/...tion/foundation-mda/src/main/resources/templates/deployment/quarkus/quarkus.chart.yaml.vm b/...tion/foundation-mda/src/main/resources/templates/deployment/quarkus/quarkus.chart.yaml.vm
@@ -31,5 +31,5 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-quarkus-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
 
diff --git a/...da/src/main/resources/templates/deployment/spark-operator/v2/spark.operator.chart.yaml.vm b/...da/src/main/resources/templates/deployment/spark-operator/v2/spark.operator.chart.yaml.vm
@@ -31,4 +31,4 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-spark-operator-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
diff --git a/...dation-mda/src/main/resources/templates/deployment/versioning/v2/versioning.chart.yaml.vm b/...dation-mda/src/main/resources/templates/deployment/versioning/v2/versioning.chart.yaml.vm
@@ -31,5 +31,5 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-versioning-chart
     version: ${versionTag}
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
 
diff --git a/...ade/src/test/resources/test-files/v1_7_0/MlflowV2ExternalS3Migration/migration/Chart.yaml b/...ade/src/test/resources/test-files/v1_7_0/MlflowV2ExternalS3Migration/migration/Chart.yaml
@@ -31,4 +31,4 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-mlflow
     version: 1.6.0
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
diff --git a/...t-files/v1_7_0/MlflowV2ExternalS3Migration/skip-migration/no-mlflow-dependency/Chart.yaml b/...t-files/v1_7_0/MlflowV2ExternalS3Migration/skip-migration/no-mlflow-dependency/Chart.yaml
@@ -31,4 +31,4 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-localstack
     version: 1.0.0
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen
diff --git a/pom.xml b/pom.xml
@@ -181,7 +181,7 @@
             </snapshots>
             <id>ossrh</id>
             <name>oss.sonatype.org-snapshots</name>
-            <url>${ossrh.repo.url}</url>
+            <url>${ossrh.repo.url}/snapshots</url>
         </pluginRepository>
         <pluginRepository>
             <releases>
@@ -193,7 +193,7 @@
             </snapshots>
             <id>s01.ossrh</id>
             <name>s01.oss.sonatype.org-snapshots</name>
-            <url>${s01.ossrh.repo.url}</url>
+            <url>${s01.ossrh.repo.url}/snapshots</url>
         </pluginRepository>
     </pluginRepositories>
     <profiles>

diff --git a/test/src/test/resources/test-app/apps/hello-world/Chart.yaml b/test/src/test/resources/test-app/apps/hello-world/Chart.yaml
@@ -28,4 +28,4 @@ appVersion: "1.0.0"
 dependencies:
   - name: aissemble-quarkus-chart
     version: 1.7.0-SNAPSHOT
-    repository: oci://ghcr.io/boozallen/
+    repository: oci://ghcr.io/boozallen