diff --git a/Jenkinsfile b/Jenkinsfile index e97cacf..1ee2541 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,23 +24,20 @@ pipeline { stages { stage('Checkout') { steps { - withCredentials([sshUserPrivateKey(credentialsId: 'gitea-ssh', keyFileVariable: 'GIT_KEYFILE')]) { - sh ''' - export GIT_SSH_COMMAND="ssh -i $GIT_KEYFILE -o StrictHostKeyChecking=accept-new" - if [ -d .git ]; then - if git remote get-url origin >/dev/null 2>&1; then - git remote set-url origin ssh://git@git.mandelblog.com:2222/salt/mandelstudio.git - else - git remote add origin ssh://git@git.mandelblog.com:2222/salt/mandelstudio.git - fi - git fetch --tags --force --progress origin +refs/heads/master:refs/remotes/origin/master + sh ''' + if [ -d .git ]; then + if git remote get-url origin >/dev/null 2>&1; then + git remote set-url origin https://git.mandelblog.com/salt/mandelstudio.git else - git clone ssh://git@git.mandelblog.com:2222/salt/mandelstudio.git . - git fetch --tags --force --progress origin +refs/heads/master:refs/remotes/origin/master + git remote add origin https://git.mandelblog.com/salt/mandelstudio.git fi - git checkout -f refs/remotes/origin/master - ''' - } + git fetch --tags --force --progress origin +refs/heads/master:refs/remotes/origin/master + else + git clone https://git.mandelblog.com/salt/mandelstudio.git . + git fetch --tags --force --progress origin +refs/heads/master:refs/remotes/origin/master + fi + git checkout -f refs/remotes/origin/master + ''' } } stage('Build') { @@ -232,26 +229,23 @@ PY timeout(time: 10, unit: 'MINUTES') } steps { - withCredentials([sshUserPrivateKey(credentialsId: 'gitea-ssh', keyFileVariable: 'GIT_KEYFILE')]) { - sh ''' - export GIT_SSH_COMMAND="ssh -i $GIT_KEYFILE -o StrictHostKeyChecking=accept-new" - if [ -d .git ]; then - if git remote get-url origin >/dev/null 2>&1; then - git remote set-url origin ssh://git@git.mandelblog.com:2222/salt/mandelstudio.git - else - git remote add origin ssh://git@git.mandelblog.com:2222/salt/mandelstudio.git - fi - git fetch --tags --force --progress origin +refs/heads/master:refs/remotes/origin/master + sh ''' + if [ -d .git ]; then + if git remote get-url origin >/dev/null 2>&1; then + git remote set-url origin https://git.mandelblog.com/salt/mandelstudio.git else - git clone ssh://git@git.mandelblog.com:2222/salt/mandelstudio.git . - git fetch --tags --force --progress origin +refs/heads/master:refs/remotes/origin/master + git remote add origin https://git.mandelblog.com/salt/mandelstudio.git fi - git checkout -f refs/remotes/origin/master - mkdir -p artifacts - chmod +x scripts/run_remote_multilingual_audit.sh - ./scripts/run_remote_multilingual_audit.sh - ''' - } + git fetch --tags --force --progress origin +refs/heads/master:refs/remotes/origin/master + else + git clone https://git.mandelblog.com/salt/mandelstudio.git . + git fetch --tags --force --progress origin +refs/heads/master:refs/remotes/origin/master + fi + git checkout -f refs/remotes/origin/master + mkdir -p artifacts + chmod +x scripts/run_remote_multilingual_audit.sh + ./scripts/run_remote_multilingual_audit.sh + ''' script { int status = sh(script: 'python3 scripts/multilingual_audit_ci.py --json artifacts/multilingual-audit.json', returnStatus: true) if (status == 2) {