jshbrmn/irt-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jshbrmn:1d38b19adb1650cbeb08a2c2ebd53223ce9396f2
Branches Tags
jshbrmn:main
...
compare: jshbrmn:6ad573dc9d4a5b7fcd685d437694c43de0faa8e3
Branches Tags
jshbrmn:main

10 Commits
1d38b19adb ... 6ad573dc9d

Author SHA1 Message Date
Joshua Burman
6ad573dc9d Merge branch 'hotfix/QUANT-3375-obj-relax' into hotfix/1.8.1 2023-12-14 12:25:58 -05:00
Joshua Burman
d93dde3ceb Merge branch 'hotfix/QUANT-3375-obj-relax' into hotfix/1.8.1 2023-12-14 12:23:36 -05:00
brmnjsh
fa2a903d89 import coin 2023-12-13 21:39:18 +00:00
brmnjsh
6d36762533 added relaxation to objective as well as time limit 2023-12-13 21:22:10 +00:00
brmnjsh
4fe8308e94 Merge pull request #39 from yardstick/feature/QUANT-3102 
QUANT-3102: use Nexus to do builds
 2023-12-05 11:00:47 -05:00
Taylor Christie
b5f1b88399 Update Jenkinsfile 2023-12-04 12:25:10 -07:00
Taylor Christie
55f71d6b81 Update Jenkinsfile 2023-12-04 12:22:08 -07:00
Joshua Burman
f1718eae37 new build args and secret values 2023-12-01 11:26:13 -05:00
Joshua Burman
8f89ad1169 pip.conf no longer needed 2023-11-30 13:04:31 -05:00
Joshua Burman
27abee53a3 target not default target for env var 2023-11-30 12:17:38 -05:00
4 changed files with 7 additions and 9 deletions
Expand all files Collapse all files

2
Dockerfile
View File

@ -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

6
Jenkinsfile vendored
View File

@ -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:]]+' || \

4
app/models/problem.py
View File

@ -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

4
pip.conf
View File

@ -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