@@ -50,21 +50,26 @@ pipeline {
5050 }
5151 }
5252
53+ stage("REPORT Python Version") {
54+ steps {
55+ sh """
56+ python3 --version
57+ """
58+ }
59+ }
60+
5361 stage("INSTALL Python Packages") {
5462 steps {
5563 sh """
56- python -m venv venv
57- . venv/bin/activate
58- pip install --upgrade pip setuptools wheel newrelic==8.8.0 pillow==10.3.0 psycopg2-binary==2.9.6
59- pip install -r requirements/requirements.dev.txt --no-index --find-links ./vendor/
64+ pip3 install --upgrade pip setuptools wheel
65+ pip3 install -r requirements/requirements.dev.txt --no-index --find-links ./vendor/
6066 """
6167 }
6268 }
6369
6470 stage("CHECK Flake8 Python Lint/Style") {
6571 steps{
6672 sh """
67- . venv/bin/activate
6873 flake8
6974 """
7075 }
@@ -73,8 +78,7 @@ pipeline {
7378 stage("RUN Django Unit Tests") {
7479 steps{
7580 sh """
76- . venv/bin/activate
77- python runtests.py
81+ python3 runtests.py
7882 """
7983 }
8084 }
@@ -85,9 +89,8 @@ pipeline {
8589 }
8690 steps{
8791 sh """
88- . venv/bin/activate
8992 mkdir ./docker-compose/tmp/
90- python manage.py migrate && python manage.py create_admin_groups && python manage.py loaddata scopes.json && python manage.py create_blue_button_scopes && python manage.py create_test_user_and_application && python manage.py create_user_identification_label_selection && python manage.py create_test_feature_switches && (if [ ! -d 'bluebutton-css' ] ; then git clone https://github.com/CMSgov/bluebutton-css.git ; else echo 'CSS already installed.' ; fi) && echo 'starting bb2...' && (export DJANGO_SETTINGS_MODULE=hhs_oauth_server.settings.logging_it && python manage.py runserver 0.0.0.0:8000 > ./docker-compose/tmp/bb2_email_to_stdout.log 2>&1 &)
93+ python3 manage.py migrate && python manage.py create_admin_groups && python manage.py loaddata scopes.json && python manage.py create_blue_button_scopes && python manage.py create_test_user_and_application && python manage.py create_user_identification_label_selection && python manage.py create_test_feature_switches && (if [ ! -d 'bluebutton-css' ] ; then git clone https://github.com/CMSgov/bluebutton-css.git ; else echo 'CSS already installed.' ; fi) && echo 'starting bb2...' && (export DJANGO_SETTINGS_MODULE=hhs_oauth_server.settings.logging_it && python manage.py runserver 0.0.0.0:8000 > ./docker-compose/tmp/bb2_email_to_stdout.log 2>&1 &)
9194 """
9295 }
9396 }
@@ -111,7 +114,6 @@ pipeline {
111114 steps{
112115 sh 'echo "RUN selenium tests - user account and app management tests"'
113116 sh """
114- . venv/bin/activate
115117 pytest ./apps/integration_tests/selenium_accounts_tests.py::TestUserAndAppMgmt::testAccountAndAppMgmt
116118 """
117119 }
@@ -120,8 +122,7 @@ pipeline {
120122 stage("RUN integration tests") {
121123 steps{
122124 sh """
123- . venv/bin/activate
124- python runtests.py --integration apps.integration_tests.integration_test_fhir_resources.IntegrationTestFhirApiResources
125+ python3 runtests.py --integration apps.integration_tests.integration_test_fhir_resources.IntegrationTestFhirApiResources
125126 """
126127 }
127128 }
@@ -133,7 +134,6 @@ pipeline {
133134 steps{
134135 sh 'echo "RUN selenium tests - testclient based authorization flow tests and data flow tests"'
135136 sh """
136- . venv/bin/activate
137137 USE_NEW_PERM_SCREEN=true pytest ./apps/integration_tests/selenium_tests.py
138138 """
139139 }
0 commit comments