From a0d3b4cebfc42c89bc11ad700cc6aebb162d88e5 Mon Sep 17 00:00:00 2001 From: wep23441 <elizabeth.mamtsits@stfc.ac.uk> Date: Thu, 27 Mar 2025 12:21:56 +0100 Subject: [PATCH] solutions hidden --- .gitignore | 2 +- solutions/case-1-lint.md | 7 ------- solutions/case-2-test.md | 5 ----- solutions/case-3-build.md | 5 ----- solutions/case-4-security.md | 3 --- 5 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 solutions/case-1-lint.md delete mode 100644 solutions/case-2-test.md delete mode 100644 solutions/case-3-build.md delete mode 100644 solutions/case-4-security.md diff --git a/.gitignore b/.gitignore index 944e3c9..2c0bb49 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ __pycache__/ node_modules/ public _build -solutions/ \ No newline at end of file +solutions_here \ No newline at end of file diff --git a/solutions/case-1-lint.md b/solutions/case-1-lint.md deleted file mode 100644 index 08b1528..0000000 --- a/solutions/case-1-lint.md +++ /dev/null @@ -1,7 +0,0 @@ -### Solution Case 1 Lint: -1. The `include` path for the lint job was incorrect in `.gitlab-ci.yml`. -2. The file paths in `flake8` and `black` were incorrect, pointing to a non-existent directory in `ci-configs/case-1-lint/lint.yml`. These should be updated to the correct paths `./case-1-lint/`. -3. The `functions.py` had various formatting issues, including: - - Unused imports - - Lack of spacing and indentation for readability - - Function definitions and class methods that were not formatted according to PEP 8 standards \ No newline at end of file diff --git a/solutions/case-2-test.md b/solutions/case-2-test.md deleted file mode 100644 index ae6c760..0000000 --- a/solutions/case-2-test.md +++ /dev/null @@ -1,5 +0,0 @@ -### Solution Case 2 Test: -1. broken dependencies (correct version of pytest==8.3.5) -2. coverage not enough to pass the job (uncomment tests inside `test_functions.py`) -3. failing test in `ci-configs/case-2-test.yml/unit_test.yml`==> (`line12: assert subtract(5, 3) == 2`) -4. incorrect command in `ci-configs/case-2-test.yml/unit_test.yml` ==> (`line 6: pytestt --> pytest`) \ No newline at end of file diff --git a/solutions/case-3-build.md b/solutions/case-3-build.md deleted file mode 100644 index bf7fd71..0000000 --- a/solutions/case-3-build.md +++ /dev/null @@ -1,5 +0,0 @@ -### Solution Case 3 Build: -1. `Dockerfile` path in the `build_image.yml` job needs to be corrected and uncomment `entrypoint: [""]`, as well as removal of unnesessary line `echo "Pushing image with tag ${CI_COMMIT_TAG}"` and figure out what the job does. -2. in `Dockerfile` the insytallation of dependencies is missing `RUN pip install --no-cache-dir -r requirements.txt` -3. `.dockerignore` file ignores `requirements.txt` at the moment, needs to be corrected -4. remove unnecessary dependency from `build.yml` \ No newline at end of file diff --git a/solutions/case-4-security.md b/solutions/case-4-security.md deleted file mode 100644 index b754ac2..0000000 --- a/solutions/case-4-security.md +++ /dev/null @@ -1,3 +0,0 @@ -### Solution Case 4 Security: -1. inside container_scan.yml the path should be CS_IMAGE: "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${IMAGE_TAG}" -2. uncommment lines in `.semgrepignore` ...all the false positives mostly..can triage and look through them if you have gitlab premium... -- GitLab