Loading capif/templates/cd-deploy-ocf.gitlab-ci.yml +37 −1 Original line number Diff line number Diff line Loading @@ -4,6 +4,7 @@ stages: - delete_ocf_staging - deploy_ocf_dev - delete_ocf_dev - dev_container_scanning variables: NAMESPACE_DEV: "ocf-dev-$CI_ENVIRONMENT_SLUG" Loading Loading @@ -40,6 +41,21 @@ variables: tags: - shell .dev_dnd: &dev_dnd allow_failure: true services: - docker:24.0.5-dind rules: - if: '$CI_COMMIT_REF_NAME == "staging"' when: never - if: '$CI_COMMIT_REF_NAME == "main"' when: never - if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+-release$/' when: never - when: always tags: - docker-in-docker ## staging before mr ### Loading Loading @@ -574,3 +590,23 @@ delete_ocf_dev: environment: name: review/$CI_COMMIT_REF_SLUG action: stop cvs_nginx: stage: dev_container_scanning needs: - deploy_ocf_dev 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_dev.gitlab-ci.yml +1 −38 Original line number Diff line number Diff line Loading @@ -4,7 +4,6 @@ stages: - dev_secrets_in_repo - dev_linting - dev_build_and_push - dev_container_scanning # DELETE variables: CI_JOB_TOKEN: $CI_JOB_TOKEN Loading @@ -18,21 +17,6 @@ variables: tags: - shell .dev_dnd: &dev_dnd allow_failure: true services: - docker:24.0.5-dind rules: - if: '$CI_COMMIT_REF_NAME == "staging"' when: never - if: '$CI_COMMIT_REF_NAME == "main"' when: never - if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+-release$/' when: never - when: always tags: - docker-in-docker dev_secrets_in_repo: stage: dev_secrets_in_repo rules: Loading Loading @@ -215,24 +199,3 @@ dev_build_and_push: - echo "----------------------------------------------------" - docker logout $CI_REGISTRY <<: *dev_common No newline at end of file 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 Loading
capif/templates/cd-deploy-ocf.gitlab-ci.yml +37 −1 Original line number Diff line number Diff line Loading @@ -4,6 +4,7 @@ stages: - delete_ocf_staging - deploy_ocf_dev - delete_ocf_dev - dev_container_scanning variables: NAMESPACE_DEV: "ocf-dev-$CI_ENVIRONMENT_SLUG" Loading Loading @@ -40,6 +41,21 @@ variables: tags: - shell .dev_dnd: &dev_dnd allow_failure: true services: - docker:24.0.5-dind rules: - if: '$CI_COMMIT_REF_NAME == "staging"' when: never - if: '$CI_COMMIT_REF_NAME == "main"' when: never - if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+-release$/' when: never - when: always tags: - docker-in-docker ## staging before mr ### Loading Loading @@ -574,3 +590,23 @@ delete_ocf_dev: environment: name: review/$CI_COMMIT_REF_SLUG action: stop cvs_nginx: stage: dev_container_scanning needs: - deploy_ocf_dev 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_dev.gitlab-ci.yml +1 −38 Original line number Diff line number Diff line Loading @@ -4,7 +4,6 @@ stages: - dev_secrets_in_repo - dev_linting - dev_build_and_push - dev_container_scanning # DELETE variables: CI_JOB_TOKEN: $CI_JOB_TOKEN Loading @@ -18,21 +17,6 @@ variables: tags: - shell .dev_dnd: &dev_dnd allow_failure: true services: - docker:24.0.5-dind rules: - if: '$CI_COMMIT_REF_NAME == "staging"' when: never - if: '$CI_COMMIT_REF_NAME == "main"' when: never - if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+-release$/' when: never - when: always tags: - docker-in-docker dev_secrets_in_repo: stage: dev_secrets_in_repo rules: Loading Loading @@ -215,24 +199,3 @@ dev_build_and_push: - echo "----------------------------------------------------" - docker logout $CI_REGISTRY <<: *dev_common No newline at end of file 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