From 5fe149e6b21b1a95a84e5f4d5139ea7d7e15c544 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jaime=20Caama=C3=B1o=20Ruiz?= <jcaamano@suse.com>
Date: Wed, 28 Feb 2018 13:37:32 +0100
Subject: [PATCH] Use gerrit-tox-verify for SFC python verification
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The original python verfication job had some issues with outdated pip
and setuptools. Take this chance to move SFC python verification over
to the global JJB tox verification job template.

The gap betwwen the two is the use of jenkins_build_package.sh to upload
the sfc-py artifact to pypi. This is silently failing anyway since the
credentials are no longer valid. It will neeed to be done through some
other way, if at all.

Change-Id: I08c483924468917bcc41fe77e06eff9930255859
JIRA: SFC-217
Signed-off-by: Jaime Caamaño Ruiz <jcaamano@suse.com>
---
 jjb/sfc/sfc-python.yaml | 55 +++--------------------------------------
 1 file changed, 3 insertions(+), 52 deletions(-)

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index bfe6ef9e0..331afd100 100644
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sfc-python
     jobs:
-      - 'sfc-verify-python-{stream}'
+      - 'gerrit-tox-verify'
 
     stream:
       - fluorine:
@@ -15,54 +15,5 @@
           branch: 'stable/carbon'
 
     project: 'sfc'
-
-- job-template:
-    name: 'sfc-verify-python-{stream}'
-
-    project-type: freestyle
-    node: centos7-builder-2c-8g
-    concurrent: true
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          gerrit-server-name: '{gerrit-server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: 'sfc-py/**'
-
-    builders:
-      - shell: |
-          virtualenv $WORKSPACE/venv-tox
-          source $WORKSPACE/venv-tox/bin/activate
-          PYTHON="$WORKSPACE/venv-tox/bin/python"
-          $PYTHON -m pip install tox argparse
-          tox --version
-          cd $WORKSPACE/sfc-py
-          tox
-          ./jenkins_build_package.sh
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[sfc]'
+    project-name: 'sfc'
+    tox-dir: sfc-py
-- 
2.36.6