From bb673b64a9d7610e8c014c1a384e83c061843d54 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 29 Nov 2023 17:19:51 +0100 Subject: [PATCH 1/8] cicd fix Signed-off-by: Jochen Mehlich --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4343b8..2e49e4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,9 @@ default: - apt -y update - apt -y install apt-utils -yqq - apt -y install net-tools python3.8 python3-pip mysql-client libmysqlclient-dev pkg-config -yqq + - echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections + - DEBIAN_FRONTEND=noninteractive sudo apt-get update && sudo apt-get -y --no-install-recommends install tzdata + - sudo cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime - apt -y upgrade - pip3 install -r requirements.txt From 2a98e17b31c74983d6a41e03835bdf9ba39ba6b3 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 29 Nov 2023 17:23:16 +0100 Subject: [PATCH 2/8] cicd reorder Signed-off-by: Jochen Mehlich --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e49e4d..d6ed870 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,10 +22,10 @@ default: before_script: - apt -y update - apt -y install apt-utils -yqq - - apt -y install net-tools python3.8 python3-pip mysql-client libmysqlclient-dev pkg-config -yqq - echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections - DEBIAN_FRONTEND=noninteractive sudo apt-get update && sudo apt-get -y --no-install-recommends install tzdata - sudo cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime + - apt -y install net-tools python3.8 python3-pip mysql-client libmysqlclient-dev pkg-config -yqq - apt -y upgrade - pip3 install -r requirements.txt From 1e7eefc535ebd1bb5ec36213991f47c467b8d32a Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 29 Nov 2023 17:25:10 +0100 Subject: [PATCH 3/8] cicd removed sudo Signed-off-by: Jochen Mehlich --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6ed870..8894409 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,8 +23,8 @@ default: - apt -y update - apt -y install apt-utils -yqq - echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections - - DEBIAN_FRONTEND=noninteractive sudo apt-get update && sudo apt-get -y --no-install-recommends install tzdata - - sudo cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime + - DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y --no-install-recommends install tzdata + - cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime - apt -y install net-tools python3.8 python3-pip mysql-client libmysqlclient-dev pkg-config -yqq - apt -y upgrade - pip3 install -r requirements.txt From c4149bcf3d1ace3c00bbd6f68f56361a6bf480cd Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 29 Nov 2023 17:28:21 +0100 Subject: [PATCH 4/8] cicd removed sudo Signed-off-by: Jochen Mehlich --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8894409..cdfb90b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ default: before_script: - apt -y update - apt -y install apt-utils -yqq - - echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections + - echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections - DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y --no-install-recommends install tzdata - cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime - apt -y install net-tools python3.8 python3-pip mysql-client libmysqlclient-dev pkg-config -yqq From 29545e8889595da4eff23200aa86ee9d28cc5130 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 29 Nov 2023 17:49:33 +0100 Subject: [PATCH 5/8] cicd database Signed-off-by: Jochen Mehlich --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cdfb90b..5e33d20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,5 +44,5 @@ django-tests: # The MYSQL user only gets permissions for MYSQL_DB, so Django can't create a test database. - echo "GRANT ALL on *.* to '${MYSQL_USER}';"| mysql -u root --password="${MYSQL_ROOT_PASSWORD}" -h mysql # use python3 explicitly. see https://wiki.ubuntu.com/Python/3 - - python3 manage.py test --database=test + - python3 manage.py test From 0bf082a1ef8db2b32d723a16af4af59a0ade140f Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 29 Nov 2023 18:01:33 +0100 Subject: [PATCH 6/8] added qodana report Signed-off-by: Jochen Mehlich --- .gitlab-ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e33d20..23c1d38 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,3 +46,19 @@ django-tests: # use python3 explicitly. see https://wiki.ubuntu.com/Python/3 - python3 manage.py test +qodana: + stage: quality + image: + name: jetbrains/qodana-python:2023.3-eap + entrypoint: [""] + variables: + QODANA_REMOTE_URL: git@$CI_SERVER_HOST:$CI_PROJECT_PATH.git + QODANA_BRANCH: $CI_COMMIT_BRANCH + QODANA_REPO_URL: $CI_PROJECT_URL + QODANA_JOB_URL: $CI_JOB_URL + script: + - qodana --save-report --results-dir=$CI_PROJECT_DIR/qodana --report-dir=$CI_PROJECT_DIR/qodana/report + artifacts: + paths: + - qodana/report/ + expose_as: 'Qodana report' From 5a4b799783e01615f52e553470cf8c122dc0dd39 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 29 Nov 2023 18:01:48 +0100 Subject: [PATCH 7/8] fixed qodana cicd stage Signed-off-by: Jochen Mehlich --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 23c1d38..378a967 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,7 +47,7 @@ django-tests: - python3 manage.py test qodana: - stage: quality + stage: test image: name: jetbrains/qodana-python:2023.3-eap entrypoint: [""] From 0b5b8be8530cb8818de2c8c2c37f0eea3a8ebefa Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 29 Nov 2023 18:11:32 +0100 Subject: [PATCH 8/8] forbid default for qodana report Signed-off-by: Jochen Mehlich --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 378a967..4324b8b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,6 +48,8 @@ django-tests: qodana: stage: test + inherit: + default: false image: name: jetbrains/qodana-python:2023.3-eap entrypoint: [""]