From a97afd8b831e7819e4ba86b2284305b9af226a60 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Mon, 1 Feb 2016 19:13:00 +0100
Subject: [PATCH] Re-Enable django_openstack_auth/designate-dashboard
 translations

Also, remove liberty jobs for these so that we do not need to backport
or handle them extra.

Backporting would break packaging by third parties, therefore not an
option.

Designate-dashboard setup is broken in liberty anyhow, so no need to
handle it extra. django_openstack_auth is good translated, and we're at
the end of translation.

Besides re-enabling the translations using the new setup, we can now
remove the old function setup_django_openstack_auth since it's not used
anymore.

Story: 2000452
Change-Id: I8b72a148d0f0e89d61807eee50a772e1fbcecaa2
---
 jenkins/jobs/projects.yaml                    |  2 --
 jenkins/scripts/common_translation_update.sh  | 10 --------
 jenkins/scripts/propose_translation_update.sh | 25 -------------------
 .../scripts/upstream_translation_update.sh    | 10 --------
 zuul/layout.yaml                              |  2 --
 5 files changed, 49 deletions(-)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 49bfd0a4b0..53ccafc06d 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -892,7 +892,6 @@
       - openstack-publish-jobs
       - pypi-jobs
       - translation-jobs
-      - translation-jobs-liberty
 
 - project:
     name: designate-specs
@@ -1193,7 +1192,6 @@
       - pypi-jobs
       - 'lib-forward-testing-{name}'
       - translation-jobs
-      - translation-jobs-liberty
       - gate-{name}-tox-{envlist}:
           envlist:
             - py27dj18
diff --git a/jenkins/scripts/common_translation_update.sh b/jenkins/scripts/common_translation_update.sh
index ce31d32d32..3baafa52eb 100644
--- a/jenkins/scripts/common_translation_update.sh
+++ b/jenkins/scripts/common_translation_update.sh
@@ -381,16 +381,6 @@ function extract_messages_django {
     trap "" EXIT
 }
 
-# Setup project django_openstack_auth for Zanata
-function setup_django_openstack_auth {
-    local project=django_openstack_auth
-    local version=${1:-master}
-
-    /usr/local/jenkins/slave_scripts/create-zanata-xml.py \
-        -p $project -v $version --srcdir openstack_auth/locale \
-        --txdir openstack_auth/locale -r '**/*.pot' \
-        '{locale_with_underscore}/LC_MESSAGES/django.po' -f zanata.xml
-}
 
 # Filter out files that we do not want to commit.
 # Sets global variable INVALID_PO_FILE to 1 if any invalid files are
diff --git a/jenkins/scripts/propose_translation_update.sh b/jenkins/scripts/propose_translation_update.sh
index 2f7014d202..3a6fd7cb4b 100755
--- a/jenkins/scripts/propose_translation_update.sh
+++ b/jenkins/scripts/propose_translation_update.sh
@@ -119,21 +119,6 @@ function propose_horizon {
     git add horizon/locale/* openstack_dashboard/locale/*
 }
 
-function propose_django_openstack_auth {
-
-    # Pull updated translations from Zanata.
-    pull_from_zanata "$PROJECT"
-
-    # Update the .pot file
-    extract_messages "openstack_auth"
-
-    # Compress downloaded po files
-    compress_po_files "openstack_auth"
-
-    # Add all changed files to git
-    git add openstack_auth/locale/*
-}
-
 # This function can be used for all django projects
 function propose_django {
     local project=$1
@@ -167,16 +152,6 @@ case "$PROJECT" in
         setup_training_guides "$ZANATA_VERSION"
         propose_training_guides
         ;;
-    django_openstack_auth|designate-dashboard)
-        echo "project temporarily disabled"
-        exit 0
-        # NOTE: Once POT file and Zanata resource name are renamed
-        # from openstack_auth(.pot) to django(.pot), the below can be used.
-        # setup_django django_openstack_auth openstack_auth "$ZANATA_VERSION"
-        # NOTE: Once django_openstack_auth repo has babel-django.cfg,
-        # the below can be used.
-        # propose_django django_openstack_auth openstack_auth
-        ;;
     horizon)
         setup_horizon "$ZANATA_VERSION"
         propose_horizon
diff --git a/jenkins/scripts/upstream_translation_update.sh b/jenkins/scripts/upstream_translation_update.sh
index 595d6da313..c6752a9d37 100755
--- a/jenkins/scripts/upstream_translation_update.sh
+++ b/jenkins/scripts/upstream_translation_update.sh
@@ -40,16 +40,6 @@ case "$PROJECT" in
     training-guides)
         setup_training_guides "$ZANATA_VERSION"
         ;;
-    django_openstack_auth|designate-dashboard)
-        echo "project temporarily disabled"
-        exit 0
-        # NOTE: Once POT file and Zanata resource name are renamed
-        # from openstack_auth(.pot) to django(.pot), the below can be used.
-        # setup_django django_openstack_auth openstack_auth "$ZANATA_VERSION"
-        # NOTE: Once django_openstack_auth repo has babel-django.cfg,
-        # the below can be used.
-        # extract_messages_django openstack_auth
-        ;;
     horizon)
         setup_horizon "$ZANATA_VERSION"
         ./run_tests.sh --makemessages -V
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 629d140996..626260beee 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4582,7 +4582,6 @@ projects:
       - name: openstack-server-release-jobs
       - name: check-requirements
       - name: translation-jobs
-      - name: translation-jobs-liberty
     check:
       - gate-designate-dsvm-powerdns
       - designate-dashboard-coverage
@@ -4746,7 +4745,6 @@ projects:
       - name: check-requirements
       - name: lib-forward-testing
       - name: translation-jobs
-      - name: translation-jobs-liberty
     check:
       - gate-django_openstack_auth-tox-py27dj18
       - gate-django_openstack_auth-tox-py27dj19