From ea83c945e03ed768b461912f95c7e36e5fe50a49 Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Fri, 22 Aug 2025 13:45:33 +0200 Subject: [PATCH 1/3] fix: update reference for pipeline templates to use sdk-pipelines --- sdk/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/.gitlab-ci.yml b/sdk/.gitlab-ci.yml index e9016dd..233bbbb 100644 --- a/sdk/.gitlab-ci.yml +++ b/sdk/.gitlab-ci.yml @@ -52,7 +52,7 @@ include: - template: 'Jobs/Container-Scanning.gitlab-ci.yml' - template: 'Secret-Detection.gitlab-ci.yml' - project: 'ocf/pipeline-scripts' - ref: cicd-capif + ref: sdk-pipelines file: - '/capif/templates/ci_staging.gitlab-ci.yml' - 'capif/templates/ci_dev.gitlab-ci.yml' -- GitLab From a75e3ae223f8cf7bc6252a055b5fa4d44f30710a Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Fri, 22 Aug 2025 14:11:09 +0200 Subject: [PATCH 2/3] fix: update include paths for CI templates to use sdk directory --- sdk/.gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sdk/.gitlab-ci.yml b/sdk/.gitlab-ci.yml index 233bbbb..95455e8 100644 --- a/sdk/.gitlab-ci.yml +++ b/sdk/.gitlab-ci.yml @@ -54,11 +54,9 @@ include: - project: 'ocf/pipeline-scripts' ref: sdk-pipelines file: - - '/capif/templates/ci_staging.gitlab-ci.yml' - - 'capif/templates/ci_dev.gitlab-ci.yml' - - 'capif/templates/ci_unit_test.gitlab-ci.yml' - - 'capif/templates/cd-deploy-ocf.gitlab-ci.yml' - - 'capif/templates/cicd-deploy-release.gitlab-ci.yml' + - 'sdk/templates/ci_dev.gitlab-ci.yml' + - 'sdk/templates/ci_staging.gitlab-ci.yml' + - 'sdk/templates/cicd-deploy-release.gitlab-ci.yml' semgrep-sast: stage: test -- GitLab From 066e632d89596e168285898c60d77a15e86f8776 Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Fri, 22 Aug 2025 14:19:28 +0200 Subject: [PATCH 3/3] fix: reorder stages to include staging_unit_tests before staging_security --- sdk/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/.gitlab-ci.yml b/sdk/.gitlab-ci.yml index 95455e8..5cae690 100644 --- a/sdk/.gitlab-ci.yml +++ b/sdk/.gitlab-ci.yml @@ -6,9 +6,9 @@ stages: - main_rf_testing - staging_secrets_in_repo - staging_linting - - staging_unit_tests - staging_security - staging_local_install + - staging_unit_tests - dev_secrets_in_repo - dev_linting - publish_sdk_pipy -- GitLab