Merge branch 'hotfix/QUANT-3375-obj-relax' into hotfix/1.8.1

QUANT-3102: use Nexus to do builds

Dockerfile

@@ -9,7 +9,7 @@ ARG PIP_INDEX
 
 ENV PIP_INDEX_URL $PIP_INDEX_URL
 ENV PIP_INDEX $PIP_INDEX
-ENV PIP_DEFAULT_TARGET /pip
+ENV PIP_TARGET /pip
 ENV PYTHONPATH /pip
 
 RUN mkdir /app

Jenkinsfile

@@ -16,7 +16,8 @@ pipeline {
               path: "ci/general",
               engineVersion: 1,
               secretValues: [
-                [envVar: 'NEXUS_TOKEN',  vaultKey: 'SONATYPE_DEPLOYMENT_USER_TOKEN']
+                [envVar: 'PIP_USER',  vaultKey: 'SONATYPE_READONLY_USER'],
+                [envVar: 'PIP_PASSWORD',  vaultKey: 'SONATYPE_READONLY_USER_PASSCODE']
               ]
             ]
           ]]) {
@@ -32,7 +33,8 @@ pipeline {
                         --insecure=true \
                         --insecure-registry=docker-registry.default:5000 \
                         --cache=true \
-                        --build-arg NEXUS_TOKEN=${NEXUS_TOKEN} \
+                        --build-arg PIP_INDEX_URL=https://${PIP_USER}:${PIP_PASSWORD}@artifact.it.getyardstick.com/repository/meazurelearning-pypi/simple \
+                        --build-arg PIP_INDEX=https://${PIP_USER}:${PIP_PASSWORD}@artifact.it.getyardstick.com/repository/meazurelearning-pypi/pypi \
                         --cache-repo=docker-registry.default:5000/${REPOSITORY} \
                         --destination ${env.REPOSITORY}:\$(echo ${BRANCH_NAME} | grep -Eo 'feature/([A-Za-z]+-[0-9]*)' | grep -Eo '[A-Za-z]+-[0-9]*' || \
                             echo ${BRANCH_NAME} | grep -Eo '(release|hotfix)/[[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+' | grep -Eo '[[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+' || \

app/models/problem.py

@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING
 
 from pydantic import BaseModel
 from typing import Any, List
-from pulp import LpProblem, LpVariable, LpStatus, lpSum
+from pulp import LpProblem, LpVariable, LpStatus, lpSum, COIN
 
 import logging
 
@@ -46,7 +46,7 @@ class Problem(BaseModel):
 
         # creating problem multi-objective functions
         objective_functions = solver_run.objective_function.for_problem(self, solver_run)
-        self.problem.sequentialSolve(objective_functions)
+        self.problem.sequentialSolve(objective_functions, None, None, COIN(gapRel=0.2, timeLimit=300))
 
         return self.problem
 

pip.conf

@@ -1,4 +0,0 @@
-[global]
-index = https://gDFaNrUq:GD7Y8tLmE6wYMZAE_JC-SWcImC7TLHB2ut_WLL4w8hBC@artifact.it.getyardstick.com/repository/meazurelearning-pypi/pypi
-index-url = https://gDFaNrUq:GD7Y8tLmE6wYMZAE_JC-SWcImC7TLHB2ut_WLL4w8hBC@artifact.it.getyardstick.com/repository/meazurelearning-pypi/simple
-target = /pip