provenance me asli commit SHA; ansible-galaxy ka galat -q flag hataya

This commit is contained in:
devops 2026-09-17 03:45:59 +00:00
parent b8196fb18d
commit 60899ac644
2 changed files with 8 additions and 4 deletions

View File

@ -14,7 +14,7 @@ def call(String target) {
export REG_PASS=$(python3 -c "import json;print(json.load(open('/tmp/reg.$$.json'))['data']['data']['password'])") export REG_PASS=$(python3 -c "import json;print(json.load(open('/tmp/reg.$$.json'))['data']['data']['password'])")
rm -f /tmp/reg.$$.json rm -f /tmp/reg.$$.json
export ANSIBLE_HOST_KEY_CHECKING=False export ANSIBLE_HOST_KEY_CHECKING=False
ansible-galaxy collection install community.docker --force -q || true ansible-galaxy collection install community.docker --force >/dev/null 2>&1 || true
ansible-playbook -i "$INVENTORY" "$PLAYBOOK" \ ansible-playbook -i "$INVENTORY" "$PLAYBOOK" \
-u "$DEPLOY_USER" --private-key "$DEPLOY_KEY" -e target="$TARGET" -u "$DEPLOY_USER" --private-key "$DEPLOY_KEY" -e target="$TARGET"
''' '''

View File

@ -52,7 +52,7 @@ def call(Map cfg = [:]) {
def rollbackTag = (env.ROLLBACK_TAG ?: '').trim() def rollbackTag = (env.ROLLBACK_TAG ?: '').trim()
def isRollback = rollbackTag != '' def isRollback = rollbackTag != ''
def imageTag, fullImage, commonEnv def imageTag, fullImage, commonEnv, gitSha
timestamps { timestamps {
timeout(time: 60, unit: 'MINUTES') { timeout(time: 60, unit: 'MINUTES') {
@ -63,6 +63,10 @@ def call(Map cfg = [:]) {
stage('Checkout') { stage('Checkout') {
checkout scm checkout scm
def sha = sh(script: 'git rev-parse --short=7 HEAD', returnStdout: true).trim() def sha = sh(script: 'git rev-parse --short=7 HEAD', returnStdout: true).trim()
// Poora SHA provenance ke liye. env.GIT_COMMIT sirf usi node par
// milta hai jahan checkout hua; sign controller par hota hai,
// isliye yahin pakad ke variable me le jaate hain.
gitSha = sh(script: 'git rev-parse HEAD', returnStdout: true).trim()
// Tag me commit SHA isliye: multibranch me har branch ka build // Tag me commit SHA isliye: multibranch me har branch ka build
// number 1 se shuru hota hai, to sirf build number rakhne par // number 1 se shuru hota hai, to sirf build number rakhne par
// tag dobara use ho jaata hai aur purani image overwrite hoti hai. // tag dobara use ho jaata hai aur purani image overwrite hoti hai.
@ -209,8 +213,8 @@ assert r['version'] == '${IMAGE_TAG}', 'version mismatch'
stage('Sign image') { cosignSign() } stage('Sign image') { cosignSign() }
stage('Provenance attest') { stage('Provenance attest') {
cosignAttest([ cosignAttest([
repo : scm.userRemoteConfigs ? scm.userRemoteConfigs[0].url : 'unknown', repo : "${P.gitea}/devops/${cfg.module}.git",
commit : env.GIT_COMMIT ?: 'unknown', commit : gitSha ?: 'unknown',
build : env.BUILD_NUMBER, build : env.BUILD_NUMBER,
job : env.JOB_NAME, job : env.JOB_NAME,
builder: "https://ns31240276.ip-51-195-4.eu:8443/${env.JOB_NAME}" builder: "https://ns31240276.ip-51-195-4.eu:8443/${env.JOB_NAME}"