diff --git a/.cirrus.yml b/.cirrus.yml index 3398b90c5e..d283898483 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -13,10 +13,10 @@ container_definition: &CONTAINER_DEFINITION namespace: default use_in_memory_disk: true -tests_task: +tooling_tests_task: gke_container: - <<: *CONTAINER_DEFINITION - dockerfile: Dockerfile + <<: *CONTAINER_DEFINITION + dockerfile: ci/Dockerfile cpu: 1 memory: 1G env: @@ -27,22 +27,43 @@ tests_task: - pipenv run pip install pytest - pipenv run pytest +frontend_tests_task: + gke_container: + <<: *CONTAINER_DEFINITION + dockerfile: ci/frontend-tests-dockerfile + cpu: 1 + memory: 2G + node_modules_cache: + folder: frontend/node_modules + reupload_on_changes: false # since there is a fingerprint script + fingerprint_script: + - echo $CIRRUS_OS + - node --version + - cat frontend/package-lock.json + populate_script: + - cd frontend + - npm install + tests_script: + - cd frontend + - npm run build + - npm test + validate_asciidoc_task: gke_container: - <<: *CONTAINER_DEFINITION - dockerfile: Dockerfile + <<: *CONTAINER_DEFINITION + dockerfile: ci/Dockerfile cpu: 1 memory: 1G metadata_tests_script: - - ./validate_metadata.sh + - ./ci/validate_metadata.sh asciidoc_tests_script: - - ./validate_asciidoc.sh + - ./ci/validate_asciidoc.sh validate_links_task: timeout_in: 120m gke_container: - <<: *CONTAINER_DEFINITION - dockerfile: Dockerfile + <<: *CONTAINER_DEFINITION + dockerfile: ci/Dockerfile cpu: 1 memory: 2G env: @@ -50,6 +71,6 @@ validate_links_task: LINK_CACHE_PATH: /root/link-probing-history.cache tests_script: - bash ci/cirrus-cache.sh download ${LINK_CACHE_NAME} ${LINK_CACHE_PATH} - - ./validate_links.sh ${LINK_CACHE_PATH} + - ./ci/validate_links.sh ${LINK_CACHE_PATH} - bash ci/cirrus-cache.sh upload ${LINK_CACHE_NAME} ${LINK_CACHE_PATH} diff --git a/Dockerfile b/ci/Dockerfile similarity index 97% rename from Dockerfile rename to ci/Dockerfile index df76ffc6b7..a01986506a 100644 --- a/Dockerfile +++ b/ci/Dockerfile @@ -2,5 +2,5 @@ FROM python:3.9-slim-buster RUN apt-get update && \ apt-get install -y --no-install-recommends jq php-json-schema asciidoctor pipenv git curl - + CMD ["bash"] diff --git a/ci/frontend-tests-dockerfile b/ci/frontend-tests-dockerfile new file mode 100644 index 0000000000..3aad5342b2 --- /dev/null +++ b/ci/frontend-tests-dockerfile @@ -0,0 +1,3 @@ +FROM node:14.17.0 + +CMD ["bash"] \ No newline at end of file diff --git a/generate_html.sh b/ci/generate_html.sh similarity index 100% rename from generate_html.sh rename to ci/generate_html.sh diff --git a/validate_asciidoc.sh b/ci/validate_asciidoc.sh similarity index 98% rename from validate_asciidoc.sh rename to ci/validate_asciidoc.sh index 3f2ac74c31..c7b2b376d4 100755 --- a/validate_asciidoc.sh +++ b/ci/validate_asciidoc.sh @@ -1,7 +1,7 @@ #!/bin/bash set -uo pipefail -./generate_html.sh +./ci/generate_html.sh exit_code=0 diff --git a/validate_links.sh b/ci/validate_links.sh similarity index 94% rename from validate_links.sh rename to ci/validate_links.sh index 048a74c843..b6554059f1 100755 --- a/validate_links.sh +++ b/ci/validate_links.sh @@ -8,7 +8,7 @@ ls -al $CACHE_PATH [ -f "$CACHE_PATH/link_probes.history" ] && cp "$CACHE_PATH/link_probes.history" ./rspec-tools/ -./generate_html.sh +./ci/generate_html.sh #validate links in asciidoc cd rspec-tools diff --git a/validate_metadata.sh b/ci/validate_metadata.sh similarity index 100% rename from validate_metadata.sh rename to ci/validate_metadata.sh diff --git a/frontend/src/deployment/__tests__/metadata.test.ts b/frontend/src/deployment/__tests__/metadata.test.ts index 6175b1e182..ce131ffe17 100644 --- a/frontend/src/deployment/__tests__/metadata.test.ts +++ b/frontend/src/deployment/__tests__/metadata.test.ts @@ -85,6 +85,7 @@ describe('metadata generation', () => { const s200StrMetadata = fs.readFileSync(`${dstPath}/S200/java-metadata.json`); const s200Metadata = JSON.parse(s200StrMetadata.toString()); + console.log(s200Metadata); expect(Object.keys(s200Metadata)).toContain('prUrl'); expect(s200Metadata.branch).toEqual('add-my-rule'); expect(s200Metadata.prUrl).toEqual('https://some.pr/url'); diff --git a/validation/schema.json b/validation/schema.json deleted file mode 100644 index 7401ea4468..0000000000 --- a/validation/schema.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2019-09/schema", - "$id": "http://sonarsource.com/schemas/rule-metadata.json", - "type": "object", - "properties": { - "title": { "type": "string" } - }, - "required": ["title"] -} \ No newline at end of file