Skip to content
Snippets Groups Projects
Unverified Commit eba95fef authored by Max Adamo's avatar Max Adamo
Browse files

temporarily remove Nomad stuff

parent ef15e310
No related branches found
No related tags found
No related merge requests found
Pipeline #82129 failed
......@@ -7,11 +7,8 @@ build:
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
DOCKER_HOST: http://docker:2375/v1.24/auth
script:
- echo "hello 1"
- echo "password is ${CI_REGISTRY_PASSWORD} and username is ${CI_REGISTRY_USER} and resgistry is ${CI_REGISTRY}"
- echo "hello 2"
- echo $CI_REGISTRY_PASSWORD | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin
#- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build -t $CI_COMMIT_BRANCH.$CI_COMMIT_TIMESTAMP .
- docker push $IMAGE_TAG
tags:
......
......@@ -3,8 +3,6 @@ basedir = os.path.abspath(os.path.dirname(__file__))
print(f"DEBUG: config {basedir}")
class Config(object):
"""Base config class"""
SQLALCHEMY_TRACK_MODIFICATIONS = False
INIT_LOCATION = '/secrets/config.ini'
# this is a test
......@@ -26,14 +26,16 @@ def filter_data(data, months_nr):
date_obj = datetime.datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%S%z')
months_diff = (
datetime.datetime.now(date_obj.tzinfo) - date_obj
) // datetime.timedelta(days=30)
) // datetime.timedelta(days=30)
if months_diff > months_nr:
filtered_data.append(item)
return filtered_data
def fetch_data(sq_ini = os.path.expanduser('~/.config/sonarqube.ini')):
def fetch_data(config_ini=os.path.expanduser('~/.config/sonarqube.ini')):
"""fetch data from SonarQube"""
config = configparser.RawConfigParser()
config.read(sq_ini)
config.read(config_ini)
sq_token = config.get('sq', 'token')
sq_host = config.get('sq', 'host')
session = requests.Session()
......@@ -47,21 +49,20 @@ def fetch_data(sq_ini = os.path.expanduser('~/.config/sonarqube.ini')):
raise Exception(f'Error: HTTP status code is {req.status_code}')
proj_list = req.json()['components']
final_list = []
list_out = []
for project in proj_list:
if 'lastAnalysisDate' in project:
final_list.append({
list_out.append({
'project_name': project['name'],
'last_analysis_date': project['lastAnalysisDate']
})
else:
final_list.append({
list_out.append({
'project_name': project['name'],
'last_analysis_date': '1970-01-01T01:00:00+0200'
})
return final_list
return list_out
if __name__ == '__main__':
......@@ -84,7 +85,6 @@ You can generate a token in SonarQube under My Account > Security
''')
os.sys.exit(1)
# filter the data based on the last_analysis_date
final_list = fetch_data()
filtered_list = filter_data(final_list, int(months))
......
from flask import Flask
from config import Config
from webapp import routes # models
app = Flask(__name__)
app.config.from_object(Config)
from webapp import routes#, models
......@@ -8,13 +8,13 @@ from sq_projects_list import filter_data, fetch_data
import config
conf = config.Config()
@app.route('/')
@app.route('/index')
def index():
"""Index page"""
try:
return Response(json.dumps(filter_data(fetch_data(conf.INIT_LOCATION),12 )), status=200 )
except:
return Response('Wea have a problem', status=500)
return filter_data(fetch_data(),12 )
return Response(json.dumps(filter_data(fetch_data(conf.INIT_LOCATION), 12)), status=200)
except Exception as err:
return Response(f'We have a problem: {err}', status=500)
return filter_data(fetch_data(), 12)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment