Standardizing CI

.github/workflows/self-hosted-release-pr.yml

@@ -0,0 +1,14 @@
+name: Create Self Hosted Release PR
+
+on:
+  workflow_dispatch:
+    inputs:
+      versionName:
+        description: 'Name of version  (ie 23.9.5)'
+        required: true
+
+jobs:
+  create-release-pr:
+    name: Create PR for Release ${{ github.event.inputs.versionName }}
+    uses: codecov/gha-workflows/.github/workflows/create-self-hosted-pr.yml@main
+    secrets: inherit

.github/workflows/self-hosted-release.yml

@@ -7,30 +7,17 @@ on:
     types: [closed]
 
 jobs:
-  push_to_registry:
+  create-release:
     name: Tag Release ${{ github.head_ref }} and Push Docker image to Docker Hub
-    if: ${{ github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/') }}
-    runs-on: ubuntu-latest
-    environment: enterprise
-    permissions:
-      contents: 'read'
-      id-token: 'write'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Initialize mandatory git config
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email [email protected]
-      - id: get-release-vars
-        name: Configure Release Vars
-        run: |
-          echo "release_version=$(cat VERSION)" >> "$GITHUB_OUTPUT"
-      - name: Create GH Release
-        uses: softprops/[email protected]
-        with:
-          token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
-          name: Release ${{ steps.get-release-vars.outputs.release_version }}
-          tag_name: self-hosted-${{ steps.get-release-vars.outputs.release_version }}
-          generate_release_notes: true
-          body: Autogenerated for ${{ steps.get-release-vars.outputs.release_version }}. Created for ${{ github.event.pull_request.html_url }}
+    if: ${{ github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/') && github.repository_owner == 'codecov' }}
+    uses: codecov/gha-workflows/.github/workflows/create-self-hosted-release.yml@main
+    secrets: inherit
+
+  push-image:
+    needs: [create-release]
+    if: ${{ github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/') && github.repository_owner == 'codecov' }}
+    uses: codecov/gha-workflows/.github/workflows/self-hosted.yml@main
+    secrets: inherit
+    with:
+      push_release: true
+      repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-worker' }}

Makefile

@@ -2,7 +2,7 @@ sha := $(shell git rev-parse --short=7 HEAD)
 full_sha := $(shell git rev-parse HEAD)
 release_version = `cat VERSION`
 _gcr := ${CODECOV_WORKER_GCR_REPO_BASE}
-
+merge_sha := $(shell git merge-base HEAD^ origin/main)
 build_date ?= $(shell git show -s --date=iso8601-strict --pretty=format:%cd $$sha)
 name ?= worker
 branch = $(shell git branch | grep \* | cut -f2 -d' ')
@@ -224,7 +224,10 @@ test_env.container_static_analysis:
 	codecovcli -u ${CODECOV_URL} static-analysis --token=${CODECOV_STATIC_TOKEN}
 
 test_env.container_label_analysis:
-	codecovcli -u ${CODECOV_URL} label-analysis --base-sha=$(shell git merge-base HEAD^ origin/main) --token=${CODECOV_STATIC_TOKEN}
+	$(shell codecovcli label-analysis --base-sha=${merge_sha} --token=${CODECOV_STATIC_TOKEN} --dry-run --dry-run-output-path=tests_to_run > /dev/null)
+	sed -i 's/--cov-context=test//g' tests_to_run
+	sed -i 's/\s\+/\n/g' tests_to_run
+	python -m pytest --cov=./ --cov-context=test `cat tests_to_run`
 
 test_env.container_ats:
 	codecovcli --codecov-yml-path=codecov_cli.yml do-upload --plugin pycoverage --plugin compress-pycoverage --flag onlysomelabels --fail-on-error

services/path_fixer/tests/unit/test_fixpaths.py

@@ -7,7 +7,6 @@
 
 # Hand-written TOCs.
 paths = [
-    ("a\\ b", ["a b"]),
     ("./a\\b", ["a/b"]),
     ("./a\n./b", ["a", "b"]),
     ("path/target/delombok/a\n./b", ["b"]),
@@ -30,6 +29,9 @@ class TestFixpaths(BaseTestCase):
     def test_clean_toc(self, toc, result):
         assert fixpaths.clean_toc(toc) == result
 
+    def test_clean_toc_with_space(self):
+        assert fixpaths.clean_toc("a\\ b") == ["a b"]
+
     @pytest.mark.parametrize("path, result", list(unquoted_files.items()))
     def test_unquote_git_path(self, path, result):
         assert fixpaths.unquote_git_path(path) == result

services/report/languages/tests/unit/test_bullseye.py

@@ -155,7 +155,7 @@ def fixes(path):
     @pytest.mark.parametrize(
         "date",
         [
-            (time.strftime("%Y-%m-%d_%H:%M:%S", (time.gmtime(time.time() - 172800)))),
+            (time.strftime("%Y-%m-%d_%H:00:00", (time.gmtime(time.time() - 172800)))),
             "2020-10-28_17:55:47",
         ],
     )

services/report/languages/tests/unit/test_clover.py

@@ -1,3 +1,4 @@
+import datetime
 import xml.etree.cElementTree as etree
 from time import time
 
@@ -161,7 +162,15 @@ def fixes(path):
 
         assert processed_report == expected_result
 
-    @pytest.mark.parametrize("date", [(int(time()) - 172800), "01-01-2014"])
+    @pytest.mark.parametrize(
+        "date",
+        [
+            (datetime.datetime.now() - datetime.timedelta(seconds=172800))
+            .replace(minute=0, second=0)
+            .strftime("%s"),
+            "01-01-2014",
+        ],
+    )
     def test_expired(self, date):
         with pytest.raises(ReportExpiredException, match="Clover report expired"):
             report_builder = ReportBuilder(

services/report/languages/tests/unit/test_cobertura.py

@@ -1,3 +1,4 @@
+import datetime
 import os
 import xml.etree.cElementTree as etree
 from time import time
@@ -194,7 +195,15 @@ def test_timestamp_zero_passes(self):
         assert len(processed_report["archive"]["file"]) == 3
         assert processed_report["totals"]["c"] == "45.45455"
 
-    @pytest.mark.parametrize("date", [(int(time()) - 172800), "01-01-2014"])
+    @pytest.mark.parametrize(
+        "date",
+        [
+            (datetime.datetime.now() - datetime.timedelta(seconds=172800))
+            .replace(minute=0, second=0)
+            .strftime("%s"),
+            "01-01-2014",
+        ],
+    )
     def test_expired(self, date):
         with pytest.raises(ReportExpiredException, match="Cobertura report expired"):
             report_builder = ReportBuilder(

services/report/languages/tests/unit/test_jacoco.py

@@ -1,3 +1,4 @@
+import datetime
 import xml.etree.cElementTree as etree
 from time import time
 
@@ -151,7 +152,15 @@ def fixes(path):
         processed_report = self.convert_report_to_better_readable(report)
         assert [path] == list(processed_report["archive"].keys())
 
-    @pytest.mark.parametrize("date", [(int(time()) - 172800), "01-01-2014"])
+    @pytest.mark.parametrize(
+        "date",
+        [
+            (datetime.datetime.now() - datetime.timedelta(seconds=172800))
+            .replace(minute=0, second=0)
+            .strftime("%s"),
+            "01-01-2014",
+        ],
+    )
     def test_expired(self, date):
         report_builder = ReportBuilder(
             current_yaml={}, sessionid=0, ignored_lines={}, path_fixer=None