Loading capif/.gitlab-ci.yml +1 −1 Original line number Diff line number Diff line Loading @@ -4,7 +4,7 @@ stages: - test - main_sast - main_container_scanning - staging_container_scanning # DELETE - dev_container_scanning # DELETE - main_build_and_push - deploy_ocf_main - main_rf_testing Loading capif/templates/ci_dev.gitlab-ci.yml +32 −31 Original line number Diff line number Diff line Loading @@ -4,6 +4,7 @@ stages: - dev_secrets_in_repo - dev_linting - dev_build_and_push - dev_container_scanning # DELETE variables: CI_JOB_TOKEN: $CI_JOB_TOKEN Loading @@ -17,39 +18,18 @@ variables: tags: - shell #dev_pulling_repo: # stage: dev_pulling_repo # script: # - git clone https://oauth2:${CI_JOB_TOKEN}@labs.etsi.org/rep/ocf/capif.git # <<: *dev_common #dev_cancel_previous_action: # stage: dev_pre_pipeline # script: # - | # echo "### cancel previous actions in dev branchc ###" # if [[ -n "$CI_JOB_TOKEN" ]]; then # echo "Checking for running jobs in the same pipeline..." # jobs=$(curl --header "PRIVATE-TOKEN: $CI_JOB_TOKEN" "$GITLAB_API/projects/$CI_PROJECT_ID/pipelines/$CI_PIPELINE_ID/jobs") # for job in $(echo "$jobs" | jq -r '.[] | @base64'); do # _jq() { # echo ${job} | base64 --decode | jq -r ${1} # } # status=$(_jq '.status') # id=$(_jq '.id') # if [[ "$status" == "running" ]] && [[ "$id" != "$CI_JOB_ID" ]]; then # echo "Cancelling job $id" # curl --request POST --header "PRIVATE-TOKEN: $CI_JOB_TOKEN" "$GITLAB_API/projects/$CI_PROJECT_ID/jobs/$id/cancel" # fi # done # fi # rules: # - if: $CI_COMMIT_BRANCH # <<: *dev_common .dev_dnd: &dev_dnd allow_failure: true services: - docker:24.0.5-dind rules: - if: '$CI_COMMIT_REF_NAME == "main"' when: always - when: never tags: - docker-in-docker dev_secrets_in_repo: # needs: # - dev_cancel_previous_action stage: dev_secrets_in_repo rules: - if: '$CI_COMMIT_REF_NAME == "staging"' Loading Loading @@ -231,3 +211,24 @@ dev_build_and_push: - echo "----------------------------------------------------" - docker logout $CI_REGISTRY <<: *dev_common cvs_nginx: stage: dev_container_scanning needs: - dev_build_and_push before_script: - export TMP_PWD=$PWD - echo "TMP_PWD=$TMP_PWD" - git clone https://oauth2:${CI_JOB_TOKEN}@labs.etsi.org/rep/ocf/capif.git - ls -lrta extends: container_scanning variables: CS_DEFAULT_BRANCH_IMAGE: "$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG" CS_IMAGE: "$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG" CS_REGISTRY_USER: $CI_REGISTRY_USER CS_REGISTRY_PASSWORD: $CAPIF_DOCKER_REGISTRY # GIT_STRATEGY: fetch # CS_DOCKERFILE_PATH: capif/services/nginx/ SECURE_LOG_LEVEL: debug <<: *dev_dnd No newline at end of file capif/templates/ci_staging.gitlab-ci.yml +1 −23 Original line number Diff line number Diff line Loading @@ -8,7 +8,6 @@ stages: - staging_security - staging_build_and_push - staging_build_and_push_mr - staging_container_scanning # DELETE variables: CI_JOB_TOKEN: $CI_JOB_TOKEN Loading Loading @@ -417,24 +416,3 @@ staging_build_and_push_mr: - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG - echo "----------------------------------------------------" - docker logout $CI_REGISTRY No newline at end of file cvs_nginx: stage: staging_container_scanning needs: - staging_unit_tests before_script: - export TMP_PWD=$PWD - echo "TMP_PWD=$TMP_PWD" - git clone https://oauth2:${CI_JOB_TOKEN}@labs.etsi.org/rep/ocf/capif.git - ls -lrta extends: container_scanning variables: CS_DEFAULT_BRANCH_IMAGE: "$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG" CS_IMAGE: "$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG" CS_REGISTRY_USER: $CI_REGISTRY_USER CS_REGISTRY_PASSWORD: $CAPIF_DOCKER_REGISTRY # GIT_STRATEGY: fetch # CS_DOCKERFILE_PATH: capif/services/nginx/ SECURE_LOG_LEVEL: debug <<: *staging_dnd No newline at end of file Loading
capif/.gitlab-ci.yml +1 −1 Original line number Diff line number Diff line Loading @@ -4,7 +4,7 @@ stages: - test - main_sast - main_container_scanning - staging_container_scanning # DELETE - dev_container_scanning # DELETE - main_build_and_push - deploy_ocf_main - main_rf_testing Loading
capif/templates/ci_dev.gitlab-ci.yml +32 −31 Original line number Diff line number Diff line Loading @@ -4,6 +4,7 @@ stages: - dev_secrets_in_repo - dev_linting - dev_build_and_push - dev_container_scanning # DELETE variables: CI_JOB_TOKEN: $CI_JOB_TOKEN Loading @@ -17,39 +18,18 @@ variables: tags: - shell #dev_pulling_repo: # stage: dev_pulling_repo # script: # - git clone https://oauth2:${CI_JOB_TOKEN}@labs.etsi.org/rep/ocf/capif.git # <<: *dev_common #dev_cancel_previous_action: # stage: dev_pre_pipeline # script: # - | # echo "### cancel previous actions in dev branchc ###" # if [[ -n "$CI_JOB_TOKEN" ]]; then # echo "Checking for running jobs in the same pipeline..." # jobs=$(curl --header "PRIVATE-TOKEN: $CI_JOB_TOKEN" "$GITLAB_API/projects/$CI_PROJECT_ID/pipelines/$CI_PIPELINE_ID/jobs") # for job in $(echo "$jobs" | jq -r '.[] | @base64'); do # _jq() { # echo ${job} | base64 --decode | jq -r ${1} # } # status=$(_jq '.status') # id=$(_jq '.id') # if [[ "$status" == "running" ]] && [[ "$id" != "$CI_JOB_ID" ]]; then # echo "Cancelling job $id" # curl --request POST --header "PRIVATE-TOKEN: $CI_JOB_TOKEN" "$GITLAB_API/projects/$CI_PROJECT_ID/jobs/$id/cancel" # fi # done # fi # rules: # - if: $CI_COMMIT_BRANCH # <<: *dev_common .dev_dnd: &dev_dnd allow_failure: true services: - docker:24.0.5-dind rules: - if: '$CI_COMMIT_REF_NAME == "main"' when: always - when: never tags: - docker-in-docker dev_secrets_in_repo: # needs: # - dev_cancel_previous_action stage: dev_secrets_in_repo rules: - if: '$CI_COMMIT_REF_NAME == "staging"' Loading Loading @@ -231,3 +211,24 @@ dev_build_and_push: - echo "----------------------------------------------------" - docker logout $CI_REGISTRY <<: *dev_common cvs_nginx: stage: dev_container_scanning needs: - dev_build_and_push before_script: - export TMP_PWD=$PWD - echo "TMP_PWD=$TMP_PWD" - git clone https://oauth2:${CI_JOB_TOKEN}@labs.etsi.org/rep/ocf/capif.git - ls -lrta extends: container_scanning variables: CS_DEFAULT_BRANCH_IMAGE: "$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG" CS_IMAGE: "$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG" CS_REGISTRY_USER: $CI_REGISTRY_USER CS_REGISTRY_PASSWORD: $CAPIF_DOCKER_REGISTRY # GIT_STRATEGY: fetch # CS_DOCKERFILE_PATH: capif/services/nginx/ SECURE_LOG_LEVEL: debug <<: *dev_dnd No newline at end of file
capif/templates/ci_staging.gitlab-ci.yml +1 −23 Original line number Diff line number Diff line Loading @@ -8,7 +8,6 @@ stages: - staging_security - staging_build_and_push - staging_build_and_push_mr - staging_container_scanning # DELETE variables: CI_JOB_TOKEN: $CI_JOB_TOKEN Loading Loading @@ -417,24 +416,3 @@ staging_build_and_push_mr: - docker push $CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server:$CI_COMMIT_REF_SLUG - echo "----------------------------------------------------" - docker logout $CI_REGISTRY No newline at end of file cvs_nginx: stage: staging_container_scanning needs: - staging_unit_tests before_script: - export TMP_PWD=$PWD - echo "TMP_PWD=$TMP_PWD" - git clone https://oauth2:${CI_JOB_TOKEN}@labs.etsi.org/rep/ocf/capif.git - ls -lrta extends: container_scanning variables: CS_DEFAULT_BRANCH_IMAGE: "$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG" CS_IMAGE: "$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx:$CI_COMMIT_REF_SLUG" CS_REGISTRY_USER: $CI_REGISTRY_USER CS_REGISTRY_PASSWORD: $CAPIF_DOCKER_REGISTRY # GIT_STRATEGY: fetch # CS_DOCKERFILE_PATH: capif/services/nginx/ SECURE_LOG_LEVEL: debug <<: *staging_dnd No newline at end of file