diff --git a/jenkins/scripts/upstream_translation_update.sh b/jenkins/scripts/upstream_translation_update.sh index c67e3c269e..093d6b89d7 100755 --- a/jenkins/scripts/upstream_translation_update.sh +++ b/jenkins/scripts/upstream_translation_update.sh @@ -17,12 +17,19 @@ JOBNAME=$2 # Replace /'s in branch names with -'s because Zanata doesn't # allow /'s in version names. -ZANATA_VERSION=${ZUUL_REFNAME//\//-} +# Zuul v3 native job passes the branch in as parameter but +# does not set ZUUL_REFNAME. +if [ -z "$ZUUL_REFNAME" ] ; then + BRANCHNAME=$3 +else + BRANCHNAME=$ZUUL_REFNAME +fi +ZANATA_VERSION=${BRANCHNAME//\//-} SCRIPTSDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source $SCRIPTSDIR/common_translation_update.sh -init_branch $ZUUL_REFNAME +init_branch $BRANCHNAME # List of all modules to copy POT files from ALL_MODULES="" diff --git a/playbooks/translation/upstream-translation-update.yaml b/playbooks/translation/upstream-translation-update.yaml index 39ba1986a1..2a9a488139 100644 --- a/playbooks/translation/upstream-translation-update.yaml +++ b/playbooks/translation/upstream-translation-update.yaml @@ -6,7 +6,7 @@ tasks: - name: Run upstream_translation_update.sh script - command: "{{ ansible_user_dir }}/scripts/upstream_translation_update.sh {{ zuul.project.short_name }} {{ zuul.job }}" + command: "{{ ansible_user_dir }}/scripts/upstream_translation_update.sh {{ zuul.project.short_name }} {{ zuul.job }} {{zuul.branch}}" args: chdir: "src/{{ zuul.project.canonical_name }}"