From d0c0d61199c610f5fa30f950b63f49cb482089e4 Mon Sep 17 00:00:00 2001 From: Ryan Ashcraft Date: Tue, 7 May 2024 15:57:37 -0400 Subject: [PATCH] #1 :wrench: working on CI build process with test.pypi.org config and downstream helm chart url fix --- build-parent/pom.xml | 23 ++++++++++++++++++- .../ROOT/pages/maven-configuration.adoc | 8 ++++--- .../airflow/v2/airflow.chart.yaml.vm | 2 +- .../data-access/v2/data.access.chart.yaml.vm | 2 +- .../v2/elasticsearch.operator.chart.yaml.vm | 2 +- .../v2/elasticsearch.chart.yaml.vm | 2 +- .../v2/hive.metastore.db.chart.yaml.vm | 2 +- .../v2/hive-metastore-service-chart.yaml.vm | 2 +- .../inference/v2/inference.chart.yaml.vm | 2 +- .../jenkins/v2/jenkins.chart.yaml.vm | 2 +- .../deployment/kafka/v2/kafka.chart.yaml.vm | 2 +- .../keycloak/v2/keycloak.chart.yaml.vm | 2 +- .../v2/lineage.custom.consumer.chart.yaml.vm | 2 +- .../v2/lineage.http.consumer.chart.yaml.vm | 2 +- .../localstack/localstack.chart.yaml.vm | 2 +- .../metadata/v2/metadata.chart.yaml.vm | 2 +- .../deployment/mlflow/v2/mlflow.chart.yaml.vm | 2 +- .../pipeline.invocation.service.chart.yaml.vm | 4 ++-- .../v2/policy.decision.point.chart.yaml.vm | 2 +- .../deployment/quarkus/quarkus.chart.yaml.vm | 2 +- .../v2/spark.operator.chart.yaml.vm | 2 +- .../versioning/v2/versioning.chart.yaml.vm | 2 +- .../migration/Chart.yaml | 2 +- .../no-mlflow-dependency/Chart.yaml | 2 +- pom.xml | 4 ++-- .../test-app/apps/hello-world/Chart.yaml | 2 +- 26 files changed, 53 insertions(+), 30 deletions(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 78efb7fef..8ea98c29c 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -28,7 +28,7 @@ ${version.maven.surefire.plugin} 2.10.2 2.8.0 - 2.13.1 + 2.14.0 3.11.4 3.2.0 19 @@ -487,6 +487,8 @@ ~${version.sedona} + false + false @@ -928,6 +930,7 @@ To suppress enforce-helm-version rule, you must add following plugin to the root false true false + true @@ -1032,6 +1035,24 @@ To suppress enforce-helm-version rule, you must add following plugin to the root true + + arm64 + + + + + org.technologybrewery.habushu + habushu-maven-plugin + ${version.habushu.plugin} + + + true + + + + + + diff --git a/docs/modules/ROOT/pages/maven-configuration.adoc b/docs/modules/ROOT/pages/maven-configuration.adoc index f627b9055..ac80dc7ff 100644 --- 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/foundation/foundation-mda/src/main/resources/templates/deployment/airflow/v2/airflow.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/airflow/v2/airflow.chart.yaml.vm index 423d893f0..df66516e5 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/airflow/v2/airflow.chart.yaml.vm +++ b/foundation/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/foundation/foundation-mda/src/main/resources/templates/deployment/data-access/v2/data.access.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/data-access/v2/data.access.chart.yaml.vm index 6fbcac03e..8d7d25f62 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/data-access/v2/data.access.chart.yaml.vm +++ b/foundation/foundation-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/foundation/foundation-mda/src/main/resources/templates/deployment/elasticsearch-operator/v2/elasticsearch.operator.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/elasticsearch-operator/v2/elasticsearch.operator.chart.yaml.vm index 92e85602f..8e271413a 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/elasticsearch-operator/v2/elasticsearch.operator.chart.yaml.vm +++ b/foundation/foundation-mda/src/main/resources/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/ \ No newline at end of file + repository: oci://ghcr.io/boozallen \ No newline at end of file diff --git a/foundation/foundation-mda/src/main/resources/templates/deployment/elasticsearch/v2/elasticsearch.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/elasticsearch/v2/elasticsearch.chart.yaml.vm index f83393100..3cdd29af7 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/elasticsearch/v2/elasticsearch.chart.yaml.vm +++ b/foundation/foundation-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/ \ No newline at end of file + repository: oci://ghcr.io/boozallen \ No newline at end of file diff --git a/foundation/foundation-mda/src/main/resources/templates/deployment/hive-metastore-db/v2/hive.metastore.db.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/hive-metastore-db/v2/hive.metastore.db.chart.yaml.vm index f366f20b7..87d49cf40 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/hive-metastore-db/v2/hive.metastore.db.chart.yaml.vm +++ b/foundation/foundation-mda/src/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/ \ No newline at end of file + repository: oci://ghcr.io/boozallen \ No newline at end of file diff --git a/foundation/foundation-mda/src/main/resources/templates/deployment/hive-metastore-service/v2/hive-metastore-service-chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/hive-metastore-service/v2/hive-metastore-service-chart.yaml.vm index bfbb8ed08..958b4835a 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/hive-metastore-service/v2/hive-metastore-service-chart.yaml.vm +++ b/foundation/foundation-mda/src/main/resources/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/ \ No newline at end of file + repository: oci://ghcr.io/boozallen \ No newline at end of file diff --git a/foundation/foundation-mda/src/main/resources/templates/deployment/inference/v2/inference.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/inference/v2/inference.chart.yaml.vm index 0d44bf3c4..a810e9e78 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/inference/v2/inference.chart.yaml.vm +++ b/foundation/foundation-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/foundation/foundation-mda/src/main/resources/templates/deployment/jenkins/v2/jenkins.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/jenkins/v2/jenkins.chart.yaml.vm index 407cc9b0c..922dccff0 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/jenkins/v2/jenkins.chart.yaml.vm +++ b/foundation/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/foundation/foundation-mda/src/main/resources/templates/deployment/kafka/v2/kafka.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/kafka/v2/kafka.chart.yaml.vm index e6e0c4290..43c5fe1fc 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/kafka/v2/kafka.chart.yaml.vm +++ b/foundation/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/foundation-mda/src/main/resources/templates/deployment/keycloak/v2/keycloak.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/keycloak/v2/keycloak.chart.yaml.vm index 8b4b99aa3..b46edfa40 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/keycloak/v2/keycloak.chart.yaml.vm +++ b/foundation/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/foundation/foundation-mda/src/main/resources/templates/deployment/lineage-custom-consumer/v2/lineage.custom.consumer.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/lineage-custom-consumer/v2/lineage.custom.consumer.chart.yaml.vm index d1d4b5a4b..6fcbe1261 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/lineage-custom-consumer/v2/lineage.custom.consumer.chart.yaml.vm +++ b/foundation/foundation-mda/src/main/resources/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/ \ No newline at end of file + repository: oci://ghcr.io/boozallen \ No newline at end of file diff --git a/foundation/foundation-mda/src/main/resources/templates/deployment/lineage-http-consumer/v2/lineage.http.consumer.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/lineage-http-consumer/v2/lineage.http.consumer.chart.yaml.vm index 5b8e7d8d9..1967095af 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/lineage-http-consumer/v2/lineage.http.consumer.chart.yaml.vm +++ b/foundation/foundation-mda/src/main/resources/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/ \ No newline at end of file + repository: oci://ghcr.io/boozallen \ No newline at end of file diff --git a/foundation/foundation-mda/src/main/resources/templates/deployment/localstack/localstack.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/localstack/localstack.chart.yaml.vm index 06d95cfe5..c951a1416 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/localstack/localstack.chart.yaml.vm +++ b/foundation/foundation-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/ \ No newline at end of file + repository: oci://ghcr.io/boozallen \ No newline at end of file diff --git a/foundation/foundation-mda/src/main/resources/templates/deployment/metadata/v2/metadata.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/metadata/v2/metadata.chart.yaml.vm index 19ac917e9..f3a4c6686 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/metadata/v2/metadata.chart.yaml.vm +++ b/foundation/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/ \ No newline at end of file + repository: oci://ghcr.io/boozallen \ No newline at end of file diff --git a/foundation/foundation-mda/src/main/resources/templates/deployment/mlflow/v2/mlflow.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/mlflow/v2/mlflow.chart.yaml.vm index c8cdba65c..9b410eb56 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/mlflow/v2/mlflow.chart.yaml.vm +++ b/foundation/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/ \ No newline at end of file + repository: oci://ghcr.io/boozallen \ No newline at end of file diff --git a/foundation/foundation-mda/src/main/resources/templates/deployment/pipeline-invocation-service/v2/pipeline.invocation.service.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/pipeline-invocation-service/v2/pipeline.invocation.service.chart.yaml.vm index e14ea00e4..51945ba16 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/pipeline-invocation-service/v2/pipeline.invocation.service.chart.yaml.vm +++ b/foundation/foundation-mda/src/main/resources/templates/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/foundation/foundation-mda/src/main/resources/templates/deployment/policy-decision-point/v2/policy.decision.point.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/policy-decision-point/v2/policy.decision.point.chart.yaml.vm index 97f55a861..43a1242cf 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/policy-decision-point/v2/policy.decision.point.chart.yaml.vm +++ b/foundation/foundation-mda/src/main/resources/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/ \ No newline at end of file + repository: oci://ghcr.io/boozallen \ No newline at end of file diff --git a/foundation/foundation-mda/src/main/resources/templates/deployment/quarkus/quarkus.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/quarkus/quarkus.chart.yaml.vm index 7c43eb4f7..6416ecbf2 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/quarkus/quarkus.chart.yaml.vm +++ b/foundation/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/foundation/foundation-mda/src/main/resources/templates/deployment/spark-operator/v2/spark.operator.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/spark-operator/v2/spark.operator.chart.yaml.vm index 75d3bbd26..b130f0d57 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/spark-operator/v2/spark.operator.chart.yaml.vm +++ b/foundation/foundation-mda/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/ \ No newline at end of file + repository: oci://ghcr.io/boozallen \ No newline at end of file diff --git a/foundation/foundation-mda/src/main/resources/templates/deployment/versioning/v2/versioning.chart.yaml.vm b/foundation/foundation-mda/src/main/resources/templates/deployment/versioning/v2/versioning.chart.yaml.vm index eec9d457a..1a0de0965 100644 --- a/foundation/foundation-mda/src/main/resources/templates/deployment/versioning/v2/versioning.chart.yaml.vm +++ b/foundation/foundation-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/foundation/foundation-upgrade/src/test/resources/test-files/v1_7_0/MlflowV2ExternalS3Migration/migration/Chart.yaml b/foundation/foundation-upgrade/src/test/resources/test-files/v1_7_0/MlflowV2ExternalS3Migration/migration/Chart.yaml index 0947f4ca9..06aedcef3 100644 --- a/foundation/foundation-upgrade/src/test/resources/test-files/v1_7_0/MlflowV2ExternalS3Migration/migration/Chart.yaml +++ b/foundation/foundation-upgrade/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/ \ No newline at end of file + repository: oci://ghcr.io/boozallen \ No newline at end of file diff --git a/foundation/foundation-upgrade/src/test/resources/test-files/v1_7_0/MlflowV2ExternalS3Migration/skip-migration/no-mlflow-dependency/Chart.yaml b/foundation/foundation-upgrade/src/test/resources/test-files/v1_7_0/MlflowV2ExternalS3Migration/skip-migration/no-mlflow-dependency/Chart.yaml index 0124982d0..66a21d104 100644 --- a/foundation/foundation-upgrade/src/test/resources/test-files/v1_7_0/MlflowV2ExternalS3Migration/skip-migration/no-mlflow-dependency/Chart.yaml +++ b/foundation/foundation-upgrade/src/test/resources/test-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/ \ No newline at end of file + repository: oci://ghcr.io/boozallen \ No newline at end of file diff --git a/pom.xml b/pom.xml index d1c0bd101..f29cf0006 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ ossrh oss.sonatype.org-snapshots - ${ossrh.repo.url} + ${ossrh.repo.url}/snapshots @@ -193,7 +193,7 @@ s01.ossrh s01.oss.sonatype.org-snapshots - ${s01.ossrh.repo.url} + ${s01.ossrh.repo.url}/snapshots 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 index aa5ccb76d..04b8f9aed 100644 --- 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