Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .cirrus/azure_app_verify_and_publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ APPLICATION_NAME="sonarqube"

echo "--- Starting Azure Marketplace K8s App Packaging Process ---"

# Replace ACR registry placeholder with actual registry value
echo "Replacing ACR registry placeholders with: ${ACR_REGISTRY}"
sed -i "s|__ACR_REGISTRY_PLACEHOLDER__|${ACR_REGISTRY}|g" azure-marketplace-k8s-app/manifest.yaml
sed -i "s|__ACR_REGISTRY_PLACEHOLDER__|${ACR_REGISTRY}|g" azure-marketplace-k8s-app/sonarqube-azure/values.yaml

cd azure-marketplace-k8s-app

# 1. Clean up previous build artifacts
Expand Down Expand Up @@ -59,9 +64,9 @@ cd ../.. # Back to azure-marketplace-k8s-app/

# # 5. Push required images to the ACR_REGISTRY registry
echo "5. Push required images to the ACR_REGISTRY registry..."
# docker tag "sonarqube:${SONARQUBE_CHART_VERSION}-enterprise" "${ACR_REGISTRY}/sonarqube:${SONARQUBE_CHART_VERSION}-enterprise"
docker tag "sonarqube:${SONARQUBE_CHART_VERSION}-enterprise" "${ACR_REGISTRY}/sonarqube:${SONARQUBE_CHART_VERSION}-enterprise"
docker tag "bitnamilegacy/postgresql:${PSQL_VERSION}" "${ACR_REGISTRY}/bitnamilegacy/postgresql:${PSQL_VERSION}"
# docker push "${ACR_REGISTRY}/sonarqube:${SONARQUBE_CHART_VERSION}-enterprise"
docker push "${ACR_REGISTRY}/sonarqube:${SONARQUBE_CHART_VERSION}-enterprise"
docker push "${ACR_REGISTRY}/bitnamilegacy/postgresql:${PSQL_VERSION}"

# 6. Run CPA verify within the container
Expand Down
2 changes: 1 addition & 1 deletion .cirrus/tasks.star
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ def build_tasks(ctx):

# The release task depends on some sonarqube and sonarqube_dce tasks,
# therefore it MUST be loaded AFTER tasks_sonarqube.yml and tasks_sonarqube_dce.yml
tasks += fs.read(".cirrus/tasks_release.yml")
tasks += "\n" + fs.read(".cirrus/tasks_release.yml")

return tasks_env + tasks_templates + tasks
16 changes: 16 additions & 0 deletions .cirrus/tasks_azure_marketplace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,22 @@ build_azure_app_template: &BUILD_AZURE_APP_TEMPLATE

build_azure_staging_app_task:
<<: *BUILD_AZURE_APP_TEMPLATE
only_if: $TRIGGER == "PUSH_AZURE_STAGING" || $TRIGGER == "PUSH_AZURE_PRODUCTION"
env:
PSQL_VERSION: 11.14.0
SQ_VERSION: 2025.5.0
AZURE_ACR_REGISTRY: "${AZURE_ACR_REGISTRY_STAGING}"
AZURE_ACR_USERNAME: "${AZURE_ACR_USERNAME_STAGING}"
AZURE_ACR_PASSWORD: "${AZURE_ACR_PASSWORD_STAGING}"

build_azure_prod_app_task:
<<: *BUILD_AZURE_APP_TEMPLATE
only_if: $TRIGGER == "PUSH_AZURE_PRODUCTION"
depends_on:
- build_azure_staging_app
env:
PSQL_VERSION: 11.14.0
SQ_VERSION: 2025.5.0
AZURE_ACR_REGISTRY: "${AZURE_ACR_REGISTRY_PRODUCTION}"
AZURE_ACR_USERNAME: "${AZURE_ACR_USERNAME_PRODUCTION}"
AZURE_ACR_PASSWORD: "${AZURE_ACR_PASSWORD_PRODUCTION}"
9 changes: 6 additions & 3 deletions .cirrus/tasks_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ env:
ROSA_OPENSHIFT_URL: VAULT[development/team/sonarqube/kv/data/rosa-openshift data.url]
ROSA_OPENSHIFT_USER: VAULT[development/team/sonarqube/kv/data/rosa-dev data.username]
ROSA_OPENSHIFT_PASSWORD: VAULT[development/team/sonarqube/kv/data/rosa-dev data.password]
AZURE_ACR_REGISTRY: VAULT[development/team/sonarqube/kv/data/azure-marketplace-staging data.url]
AZURE_ACR_USERNAME: VAULT[development/team/sonarqube/kv/data/azure-marketplace-staging data.username]
AZURE_ACR_PASSWORD: VAULT[development/team/sonarqube/kv/data/azure-marketplace-staging data.password]
AZURE_ACR_REGISTRY_STAGING: VAULT[development/team/sonarqube/kv/data/azure-marketplace-staging data.url]
AZURE_ACR_USERNAME_STAGING: VAULT[development/team/sonarqube/kv/data/azure-marketplace-staging data.username]
AZURE_ACR_PASSWORD_STAGING: VAULT[development/team/sonarqube/kv/data/azure-marketplace-staging data.password]
AZURE_ACR_REGISTRY_PRODUCTION: VAULT[development/team/sonarqube/kv/data/azure-marketplace-production data.url]
AZURE_ACR_USERNAME_PRODUCTION: VAULT[development/team/sonarqube/kv/data/azure-marketplace-production data.username]
AZURE_ACR_PASSWORD_PRODUCTION: VAULT[development/team/sonarqube/kv/data/azure-marketplace-production data.password]
2 changes: 1 addition & 1 deletion azure-marketplace-k8s-app/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: 2025.4.3
helmChart: "./sonarqube-azure"
clusterArmTemplate: "./mainTemplate.json"
uiDefinition: "./createUIDefinition.json"
registryServer: "testsqsmarketplace.azurecr.io"
registryServer: "__ACR_REGISTRY_PLACEHOLDER__"
extensionRegistrationParameters:
defaultScope: "cluster" # cluster or namespace
namespace: "sonarqube"
4 changes: 2 additions & 2 deletions azure-marketplace-k8s-app/sonarqube-azure/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ global:
resourceId: "DONOTMODIFY" # application's Azure Resource ID, Azure populates this value at deployment time
images:
sonarqube:
registry: testsqsmarketplace.azurecr.io
registry: __ACR_REGISTRY_PLACEHOLDER__
image: sonarqube
tag: 2025.5.0-enterprise
postgresql:
registry: testsqsmarketplace.azurecr.io
registry: __ACR_REGISTRY_PLACEHOLDER__
image: bitnamilegacy/postgresql
tag: 11.14.0
Loading