Skip to content

DS-3900 dev pipeline trigger fix #1068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ajmu1 wants to merge 4 commits into from
Closed

DS-3900 dev pipeline trigger fix #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afec04b
Transferring DI repo from nhsd-exeter to NHSDigital org
ajmu1 Jun 5, 2025
0e599dc
Reverting sonar organization name code quality GHA
ajmu1 Jun 5, 2025
23cfd83
Updating code owners for new org
ajmu1 Jun 6, 2025
10b754f
Fixing sonar cloud integration
ajmu1 Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/.github @nhsd-exeter/maintainers
/build/automation/lib @nhsd-exeter/maintainers
/build/automation/init.mk @nhsd-exeter/maintainers
/.gitignore @nhsd-exeter/maintainers
/project.code-workspace @nhsd-exeter/maintainers
/.github @NHSDigital/data-sourcing-ftrs/maintainers
/build/automation/lib @NHSDigital/data-sourcing-ftrs/maintainers
/build/automation/init.mk @NHSDigital/data-sourcing-ftrs/maintainers
/.gitignore @NHSDigital/data-sourcing-ftrs/maintainers
/project.code-workspace @NHSDigital/data-sourcing-ftrs/maintainers
4 changes: 2 additions & 2 deletions .github/workflows/code-quality.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
projectBaseDir: .
args: >
-Dsonar.sources=application,infrastructure,scripts,test,build/docker
-Dsonar.organization=nhsd-exeter
-Dsonar.projectKey=uec-dos-int
-Dsonar.organization=nhsdigital
-Dsonar.projectKey=nhsdigital_dos-integration
-Dsonar.coverage.exclusions=tests/**,**/tests/**,infrastructure,application/dos_db_handler/**,test/**,scripts/**,application/conftest.py
-Dsonar.python.coverage.reportPaths=coverage.xml
-Dsonar.python.version=3.12
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ tag-commit-to-destroy-environment: # Tag git commit to destroy deployment - mand
fi

get-environment-from-pr:
ENVIRONMENT=$$(gh pr list -s merged --json number,mergeCommit,headRefName --repo=nhsd-exeter/dos-integration | jq --raw-output '.[] | select(.number == $(PR_NUMBER)) | .headRefName | sub( ".*:*/DS-(?<x>.[0-9]*).*"; "ds-\(.x)") ')
ENVIRONMENT=$$(gh pr list -s merged --json number,mergeCommit,headRefName --repo=NHSDigital/dos-integration | jq --raw-output '.[] | select(.number == $(PR_NUMBER)) | .headRefName | sub( ".*:*/DS-(?<x>.[0-9]*).*"; "ds-\(.x)") ')
echo $$ENVIRONMENT

is-environment-deployed:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ The main components you will need for _basic_ development work, are your OS vers

Clone the repository

git clone git@github.com:nhsd-exeter/dos-integration.git
git clone git@github.com:NHSDigital/dos-integration.git
cd ./dos-integration

### AWS Authentication
Expand Down
2 changes: 1 addition & 1 deletion build/automation/lib/docker.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ docker-run-sonar-scanner-cli: ### Run sonar-scanner-cli container - mandatory: C
mkdir -p $(TMP_DIR)/.sonar/cache
image=$$([ -n "$(IMAGE)" ] && echo $(IMAGE) || echo sonarsource/sonar-scanner-cli:$(DOCKER_SONAR_SCANNER_CLI_VERSION))
container=$$([ -n "$(CONTAINER)" ] && echo $(CONTAINER) || echo node-$(BUILD_COMMIT_HASH)-$(BUILD_ID)-$$(date --date=$$(date -u +"%Y-%m-%dT%H:%M:%S%z") -u +"%Y%m%d%H%M%S" 2> /dev/null)-$$(make secret-random LENGTH=8))
docker run --interactive $(_TTY) --rm \
$(DOCKER_CMD) run --interactive $(_TTY) --rm \
--name $$container \
--user $$(id -u):$$(id -g) \
--env-file <(make _list-variables PATTERN="^(AWS|TX|TEXAS|NHSD|TERRAFORM)") \
Expand Down
6 changes: 3 additions & 3 deletions build/automation/var/project.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ORG_NAME = nhsd-exeter
ORG_NAME = NHSDigital
PROGRAMME = uec
PROJECT_GROUP = uec/dos
PROJECT_GROUP_SHORT = uec-dos
Expand Down Expand Up @@ -26,7 +26,7 @@ TF_VAR_environment = $(ENVIRONMENT)
TF_VAR_aws_account_name = $(AWS_ACCOUNT_NAME)
TF_VAR_deployment_secrets = $(DEPLOYMENT_SECRETS)
PROJECT_DEPLOYMENT_SECRETS = $(DEPLOYMENT_SECRETS)
TF_VAR_github_owner = nhsd-exeter
TF_VAR_github_owner = NHSDigital
TF_VAR_github_repo = dos-integration
PARALLEL_TEST_COUNT := $(or $(PARALLEL_TEST_COUNT), auto)

Expand All @@ -45,7 +45,7 @@ TF_VAR_cicd_blue_green_deployment_pipeline_name := $(PROJECT_ID)-$(ENVIRONMENT)-
TF_VAR_cicd_shared_resources_deployment_pipeline_name := $(PROJECT_ID)-$(ENVIRONMENT)-cicd-shared-resources-deployment-pipeline
TF_VAR_blue_green_deployment_new_version_parameter_name := $(PROJECT_ID)-$(ENVIRONMENT)-blue-green-deployment-new-version
TF_VAR_development_tools_encryption_key_alias := $(PROJECT_ID)-$(ENVIRONMENT)-development-tools-encryption-key
TF_VAR_github_url := https://github.com/nhsd-exeter/dos-integration.git
TF_VAR_github_url := https://github.com/NHSDigital/dos-integration.git
TF_VAR_pipeline_topic_name := $(PROJECT_ID)-$(ENVIRONMENT)-pipeline-topic
TF_VAR_pipeline_notification_name := $(PROJECT_ID)-$(ENVIRONMENT)-pipeline-notification
TF_VAR_cicd_blue_green_deployment_pipeline_nofitication_name := $(PROJECT_ID)-$(ENVIRONMENT)-blue-green-pipeline-notification
Expand Down
Loading