Fix dev session Redis deployment validation

This commit is contained in:
2026-06-01 10:58:20 +09:00
parent 898671cd4d
commit a6c2c631ec
3 changed files with 30 additions and 3 deletions
Vendored
+29 -1
View File
@@ -81,7 +81,8 @@ spec:
def OTEL_ENV = (TARGET_ENV == 'dev') ? 'dev' : (TARGET_ENV == 'stage') ? 'stage' : 'prod'
def OTEL_SERVICE_NAME = (TARGET_ENV == 'dev') ? 'sayit-helpdesk-dev' : (TARGET_ENV == 'stage') ? 'sayit-helpdesk-stage' : 'sayit-helpdesk'
def IMAGE_TAG_PREFIX = (env.JOB_NAME?.contains('session')) ? "${TARGET_ENV}-session" : TARGET_ENV
def IS_SESSION_JOB = env.JOB_NAME?.contains('session') ? 'true' : 'false'
def IMAGE_TAG_PREFIX = (IS_SESSION_JOB == 'true') ? "${TARGET_ENV}-session" : TARGET_ENV
def IMAGE_TAG = "${IMAGE_TAG_PREFIX}-${env.BUILD_NUMBER}" // dev-123 / dev-session-123
def LATEST_TAG = "latest-${IMAGE_TAG_PREFIX}" // latest-dev / latest-dev-session
@@ -93,6 +94,7 @@ spec:
echo "APP_NS = ${APP_NS}"
echo "OTEL_ENV = ${OTEL_ENV}"
echo "OTEL_SERVICE_NAME = ${OTEL_SERVICE_NAME}"
echo "IS_SESSION_JOB = ${IS_SESSION_JOB}"
echo "IMAGE_TAG = ${IMAGE_TAG}"
echo "LATEST_TAG = ${LATEST_TAG}"
}
@@ -147,12 +149,38 @@ spec:
container('kubectl') {
sh """
set -eux
if [ "${IS_SESSION_JOB}" = "true" ]; then
kubectl -n ${APP_NS} scale deploy/${DEPLOY} --replicas=0
for i in \$(seq 1 150); do
POD_COUNT=\$(kubectl -n ${APP_NS} get pod -l app=${DEPLOY} --no-headers 2>/dev/null | wc -l | tr -d ' ')
[ "\${POD_COUNT}" = "0" ] && break
sleep 2
if [ "\${i}" = "150" ]; then
kubectl -n ${APP_NS} get pod -l app=${DEPLOY} -o wide
exit 1
fi
done
fi
kubectl -n ${APP_NS} set image deploy/${DEPLOY} ${DEPLOY}=${REG}/${IMAGE}:${IMAGE_TAG}
if [ "${IS_SESSION_JOB}" = "true" ]; then
kubectl -n ${APP_NS} scale deploy/${DEPLOY} --replicas=1
fi
kubectl -n ${APP_NS} rollout status deploy/${DEPLOY} --timeout=300s
DEPLOY_IMAGE=\$(kubectl -n ${APP_NS} get deploy ${DEPLOY} -o jsonpath='{.spec.template.spec.containers[0].image}')
test "\${DEPLOY_IMAGE}" = "${REG}/${IMAGE}:${IMAGE_TAG}"
kubectl -n ${APP_NS} get deploy ${DEPLOY} -o wide
kubectl -n ${APP_NS} get pods -l app=${DEPLOY} -o wide
kubectl -n ${APP_NS} get pod -l app=${DEPLOY} -o jsonpath='{.items[*].spec.containers[*].image}'; echo
if [ "${IS_SESSION_JOB}" = "true" ]; then
POD_IMAGES=\$(kubectl -n ${APP_NS} get pod -l app=${DEPLOY} -o jsonpath='{.items[*].spec.containers[*].image}')
test "\${POD_IMAGES}" = "${REG}/${IMAGE}:${IMAGE_TAG}"
fi
"""
}
}