openstack/project-config
Code Issues Proposed changes

Merge "Fix ZUUL_REFNAME for translation jobs"

Browse Source
This commit is contained in:
Zuul
2017-10-18 16:08:38 +00:00
committed by Gerrit Code Review
parent 47122c4f1b ccf36ea678
commit 79fdbb3faf
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jenkins/scripts/upstream_translation_update.sh
View File

@@ -17,12 +17,19 @@ JOBNAME=$2
# Replace /'s in branch names with -'s because Zanata doesn't # Replace /'s in branch names with -'s because Zanata doesn't
# allow /'s in version names. # 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 )" SCRIPTSDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $SCRIPTSDIR/common_translation_update.sh source $SCRIPTSDIR/common_translation_update.sh
init_branch $ZUUL_REFNAME init_branch $BRANCHNAME
# List of all modules to copy POT files from # List of all modules to copy POT files from
ALL_MODULES="" ALL_MODULES=""

2
playbooks/translation/upstream-translation-update.yaml
View File

@@ -6,7 +6,7 @@
tasks: tasks:
- name: Run upstream_translation_update.sh script - 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: args:
chdir: "src/{{ zuul.project.canonical_name }}" chdir: "src/{{ zuul.project.canonical_name }}"