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

Compare commits

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

No commits in common. "6ad573dc9d4a5b7fcd685d437694c43de0faa8e3" and "1d38b19adb1650cbeb08a2c2ebd53223ce9396f2" have entirely different histories.
6ad573dc9d ... 1d38b19adb

4 changed files with 9 additions and 7 deletions
Show Stats 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_URL $PIP_INDEX_URL
ENV PIP_INDEX $PIP_INDEX ENV PIP_INDEX $PIP_INDEX
ENV PIP_TARGET /pip ENV PIP_DEFAULT_TARGET /pip
ENV PYTHONPATH /pip ENV PYTHONPATH /pip
RUN mkdir /app RUN mkdir /app

6
Jenkinsfile vendored
View File

@ -16,8 +16,7 @@ pipeline {
path: "ci/general", path: "ci/general",
engineVersion: 1, engineVersion: 1,
secretValues: [ secretValues: [
[envVar: 'PIP_USER', vaultKey: 'SONATYPE_READONLY_USER'], [envVar: 'NEXUS_TOKEN', vaultKey: 'SONATYPE_DEPLOYMENT_USER_TOKEN']
[envVar: 'PIP_PASSWORD', vaultKey: 'SONATYPE_READONLY_USER_PASSCODE']
] ]
] ]
]]) { ]]) {
@ -33,8 +32,7 @@ pipeline {
--insecure=true \ --insecure=true \
--insecure-registry=docker-registry.default:5000 \ --insecure-registry=docker-registry.default:5000 \
--cache=true \ --cache=true \
--build-arg PIP_INDEX_URL=https://${PIP_USER}:${PIP_PASSWORD}@artifact.it.getyardstick.com/repository/meazurelearning-pypi/simple \ --build-arg NEXUS_TOKEN=${NEXUS_TOKEN} \
--build-arg PIP_INDEX=https://${PIP_USER}:${PIP_PASSWORD}@artifact.it.getyardstick.com/repository/meazurelearning-pypi/pypi \
--cache-repo=docker-registry.default:5000/${REPOSITORY} \ --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]*' || \ --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:]]+' || \ 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 pydantic import BaseModel
from typing import Any, List from typing import Any, List
from pulp import LpProblem, LpVariable, LpStatus, lpSum, COIN from pulp import LpProblem, LpVariable, LpStatus, lpSum
import logging import logging
@ -46,7 +46,7 @@ class Problem(BaseModel):
# creating problem multi-objective functions # creating problem multi-objective functions
objective_functions = solver_run.objective_function.for_problem(self, solver_run) objective_functions = solver_run.objective_function.for_problem(self, solver_run)
self.problem.sequentialSolve(objective_functions, None, None, COIN(gapRel=0.2, timeLimit=300)) self.problem.sequentialSolve(objective_functions)
return self.problem return self.problem

4
pip.conf Normal file
View File

@ -0,0 +1,4 @@
[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