#1368 update test requirements in jenkins
Merged 5 years ago by mikem. Opened 5 years ago by tkopecek.
tkopecek/koji issue1367  into  master

@@ -104,21 +104,24 @@ 

    fi

    source kojienv/bin/activate

  

-   # install python requirements via pip, you can also specify exact versions

-   here

+   # install python requirements via pip, you can also specify exact versions here

    if [ $NODE_NAME == "EL6" ] ; then

-       pip install psycopg2\<2.7 --upgrade --ignore-installed

+       pip install "psycopg2<2.7" "urllib3<1.24" "requests<2.20" "requests-mock<1.5" \

+                   "Markdown<3.1" nose python-qpid-proton mock coverage python-multilib \

+                   Cheetah --upgrade --ignore-installed

    else

        pip install pip packaging --upgrade --ignore-installed

        pip install setuptools --upgrade --ignore-installed

-       pip install psycopg2 --upgrade --ignore-installed

-   fi

-   pip install nose python-qpid-proton mock coverage python-multilib --upgrade --ignore-installed

-   if [ -x /usr/bin/python3 ] ; then

-       pip install Cheetah3 nose-cover3 --upgrade --ignore-installed

-   else

-       pip install Cheetah --upgrade --ignore-installed

+       pip install psycopg2 requests-mock nose python-qpid-proton mock coverage \

+                   python-multilib --upgrade --ignore-installed

+       if [ -x /usr/bin/python3 ] ; then

+           pip install Cheetah3 nose-cover3 --upgrade --ignore-installed

+       else

+           pip install Cheetah --upgrade --ignore-installed

+       fi

    fi

+ 

+ 

    # rehash package to be sure updated versions are used

    hash -r

  
@@ -135,7 +138,7 @@ 

  

    # remove possible coverage output and run tests

    coverage erase

-   PYTHONPATH=hub/.:plugins/hub/.:plugins/builder/.:cli/plugins/cli/.:cli/.:www/lib/.  nosetests --with-coverage --cover-package .

+   PYTHONPATH=hub/.:plugins/hub/.:plugins/builder/.:cli/plugins/cli/.:cli/.:www/lib/. nosetests --with-coverage --cover-package .

    coverage xml --omit 'kojienv/*'

  

    # run additional tests if configured
@@ -145,7 +148,6 @@ 

    # kill virtual environment

    deactivate

  

- 

  - *Post-build actions*

  

    * *Publish Cobertura Coverage report*: coverage.xml - this will create coverage report accessible via jenkins web ui