diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c423f2c7..cda76e0f 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -16,9 +16,6 @@ jobs: check-commit-message: runs-on: ubuntu-20.04 - env: - COMMIT_MESSAGE_PATTERN: '^(feat|fix|docs|style|refactor|test|chore){1}(!)?:\s[A-Z][a-z]([\/\.\w\-\s]+)\(\#\d+\)$' - MAX_LINE_LENGTH: '80' steps: - name: Checkout code uses: actions/checkout@v4 @@ -30,6 +27,10 @@ jobs: with: pattern: '^(fix|feat|docs|style|refactor|test|chore): .+ \(#\d+\)$' error: 'Your commit message should be in the format "type: Description (#issue)". Example: "fix: Update build (#33)"' + excludeDescription: 'true' + excludeTitle: 'true' + checkAllCommitMessages: 'true' + accessToken: ${{ secrets.GITHUB_TOKEN }} - name: Check Line Length uses: gsactions/commit-message-checker@v2 diff --git a/Makefile b/Makefile index b442a4ea..8d390ba6 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,8 @@ KIND_CLUSTER_NAME?="tekton" KUBE_VERSION?=1.27 KIND_CONFIG?=./hack/kind-$(KUBE_VERSION).yaml +CONTAINER_REGISTRY_URL?="repo" +CONTAINER_REGISTRY_SPACE?="edp" E2E_IMAGE_REPOSITORY?="tekton-image" E2E_IMAGE_TAG?="latest" @@ -103,9 +105,9 @@ ${CURRENT_DIR}/.venv/bin/activate: ## Run e2e tests. Requires kind with running cluster and kuttl tool. e2e: build - docker build --no-cache -t ${E2E_IMAGE_REPOSITORY}:${E2E_IMAGE_TAG} . - kind load --name $(KIND_CLUSTER_NAME) docker-image ${E2E_IMAGE_REPOSITORY}:${E2E_IMAGE_TAG} - E2E_IMAGE_REPOSITORY=${E2E_IMAGE_REPOSITORY} E2E_IMAGE_TAG=${E2E_IMAGE_TAG} kubectl-kuttl test + docker build --no-cache -t ${CONTAINER_REGISTRY_URL}/${CONTAINER_REGISTRY_SPACE}/${E2E_IMAGE_REPOSITORY}:${E2E_IMAGE_TAG} . + kind load --name $(KIND_CLUSTER_NAME) docker-image ${CONTAINER_REGISTRY_URL}/${CONTAINER_REGISTRY_SPACE}/${E2E_IMAGE_REPOSITORY}:${E2E_IMAGE_TAG} + E2E_IMAGE_REPOSITORY=${E2E_IMAGE_REPOSITORY} CONTAINER_REGISTRY_URL=${CONTAINER_REGISTRY_URL} CONTAINER_REGISTRY_SPACE=${CONTAINER_REGISTRY_SPACE} E2E_IMAGE_TAG=${E2E_IMAGE_TAG} kubectl-kuttl test GOLANGCILINT = ${CURRENT_DIR}/bin/golangci-lint .PHONY: golangci-lint diff --git a/sonar-project.properties b/sonar-project.properties index ee0d308e..0f75caee 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,4 +2,4 @@ sonar.projectKey=edp-tekton sonar.projectName=edp-tekton sonar.go.coverage.reportPaths=coverage.out sonar.test.inclusions=**/*_test.go -sonar.exclusions=**/charts/**,**/cmd/**,**/tests/**,**/hack/** +sonar.exclusions=*/cache/**,**/config/**,**/deploy-templates/**,**/charts/**,**/cmd/**,**/tests/**,**/hack/** diff --git a/tests/e2e/gerrit/02-install.yaml b/tests/e2e/gerrit/02-install.yaml index 967bfa84..55317cb9 100644 --- a/tests/e2e/gerrit/02-install.yaml +++ b/tests/e2e/gerrit/02-install.yaml @@ -4,7 +4,7 @@ commands: - command: | helm install tekton-e2e ../../../charts/pipelines-library --values ../values.yaml - --set interceptor.image.repository=${E2E_IMAGE_REPOSITORY} + --set interceptor.image.repository=${CONTAINER_REGISTRY_URL}/${CONTAINER_REGISTRY_SPACE}/${E2E_IMAGE_REPOSITORY} --set interceptor.image.tag=${E2E_IMAGE_TAG} --set global.dnsWildCard=example.com --set global.gitProviders[0]=gerrit diff --git a/tests/e2e/github/02-install.yaml b/tests/e2e/github/02-install.yaml index 0b297d84..0a166773 100644 --- a/tests/e2e/github/02-install.yaml +++ b/tests/e2e/github/02-install.yaml @@ -4,7 +4,7 @@ commands: - command: | helm install tekton-e2e ../../../charts/pipelines-library --values ../values.yaml - --set interceptor.image.repository=${E2E_IMAGE_REPOSITORY} + --set interceptor.image.repository=${CONTAINER_REGISTRY_URL}/${CONTAINER_REGISTRY_SPACE}/${E2E_IMAGE_REPOSITORY} --set interceptor.image.tag=${E2E_IMAGE_TAG} --set global.dnsWildCard=example.com --set global.gitProviders[0]=github diff --git a/tests/e2e/gitlab/02-install.yaml b/tests/e2e/gitlab/02-install.yaml index c332daea..6146522c 100644 --- a/tests/e2e/gitlab/02-install.yaml +++ b/tests/e2e/gitlab/02-install.yaml @@ -4,7 +4,7 @@ commands: - command: | helm install tekton-e2e ../../../charts/pipelines-library --values ../values.yaml - --set interceptor.image.repository=${E2E_IMAGE_REPOSITORY} + --set interceptor.image.repository=${CONTAINER_REGISTRY_URL}/${CONTAINER_REGISTRY_SPACE}/${E2E_IMAGE_REPOSITORY} --set interceptor.image.tag=${E2E_IMAGE_TAG} --set global.dnsWildCard=example.com --set global.gitProviders[0]=gitlab