From 4da6b0da3a7e1b82dbd36752f0aca2c6796339e7 Mon Sep 17 00:00:00 2001 From: Brad Stein Date: Sun, 12 Apr 2026 05:26:45 -0300 Subject: [PATCH] jenkins: run data-prepper from main and default publish repo to monitoring --- services/jenkins/configmap-jcasc.yaml | 2 +- services/logging/Jenkinsfile.data-prepper | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/jenkins/configmap-jcasc.yaml b/services/jenkins/configmap-jcasc.yaml index 273640a0..6a775c03 100644 --- a/services/jenkins/configmap-jcasc.yaml +++ b/services/jenkins/configmap-jcasc.yaml @@ -300,7 +300,7 @@ data: url('https://scm.bstein.dev/bstein/titan-iac.git') credentials('gitea-pat') } - branches('*/feature/sso-hardening') + branches('*/main') } } scriptPath('services/logging/Jenkinsfile.data-prepper') diff --git a/services/logging/Jenkinsfile.data-prepper b/services/logging/Jenkinsfile.data-prepper index deb6192f..09ab28b5 100644 --- a/services/logging/Jenkinsfile.data-prepper +++ b/services/logging/Jenkinsfile.data-prepper @@ -36,7 +36,7 @@ spec: PUSHGATEWAY_URL = 'http://platform-quality-gateway.monitoring.svc.cluster.local:9091' } parameters { - string(name: 'HARBOR_REPO', defaultValue: 'registry.bstein.dev/streaming/data-prepper', description: 'Docker repository for Data Prepper') + string(name: 'HARBOR_REPO', defaultValue: 'registry.bstein.dev/monitoring/data-prepper', description: 'Docker repository for Data Prepper') string(name: 'IMAGE_TAG', defaultValue: '2.8.0', description: 'Image tag to publish') booleanParam(name: 'PUSH_IMAGE', defaultValue: false, description: 'Publish image artifacts (manual release only)') booleanParam(name: 'PUSH_LATEST', defaultValue: true, description: 'Also push the latest tag') @@ -58,8 +58,8 @@ spec: withCredentials([usernamePassword(credentialsId: 'harbor-robot', usernameVariable: 'HARBOR_USERNAME', passwordVariable: 'HARBOR_PASSWORD')]) { sh ''' set -euo pipefail - if [ -z "${HARBOR_REPO:-}" ] || [ "${HARBOR_REPO}" = "registry.bstein.dev/monitoring/data-prepper" ]; then - HARBOR_REPO="registry.bstein.dev/streaming/data-prepper" + if [ -z "${HARBOR_REPO:-}" ]; then + HARBOR_REPO="registry.bstein.dev/monitoring/data-prepper" fi IMAGE_TAG_SAFE="${IMAGE_TAG:-2.8.0}" mkdir -p /kaniko/.docker