From 71a1d0a6d24f40093ceca9b2c8f3ccf65094cca3 Mon Sep 17 00:00:00 2001 From: chausman <chausman@nrao.edu> Date: Fri, 26 Aug 2022 12:21:00 -0600 Subject: [PATCH] turn pipeline stages back on --- .gitlab-ci.yml | 178 ++++++++++++++++++++++++------------------------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20eda3567..2827544f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,8 +7,8 @@ stages: - test-coverage - push - deploy-coverage-page -# - generate-yaml -# - trigger + - generate-yaml + - trigger - deploy # - e2e-test # e2e tests disabled - .post @@ -300,93 +300,93 @@ pages: rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH -## Generate PEX builder yaml for child pipeline -#pex generate yaml: -# stage: generate-yaml -# image: python:3.8-slim -# before_script: -# - apt update && apt install -y git -# - pip install pyyaml -# script: -# - DEPLOY_ENV=${DEPLOY_ENV} ./ci/bin/generate-yaml.py -# rules: -# - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH -# changes: -# - apps/cli/executables/pexable/**/* -# - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/' -# variables: -# # override DEPLOY_ENV -# DEPLOY_ENV: "test" -# - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' -# variables: -# DEPLOY_ENV: "prod" -# artifacts: -# paths: -# - generated-pex-build-pipeline.yml -# -## Trigger child pipeline based on generated PEX builder yaml -#pex child pipeline: -# stage: trigger -# trigger: -# include: -# - artifact: generated-pex-build-pipeline.yml -# job: pex generate yaml -# strategy: depend -# rules: -# - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH -# changes: -# - apps/cli/executables/pexable/**/* -# - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/' -# variables: -# # override DEPLOY_ENV -# DEPLOY_ENV: "test" -# - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' -# variables: -# DEPLOY_ENV: "prod" -# -## Generate go builder yaml for child pipeline -#go generate yaml: -# stage: generate-yaml -# image: python:3.8-slim -# before_script: -# - apt update && apt install -y git -# - pip install pyyaml -# script: -# - DEPLOY_ENV=${DEPLOY_ENV} ./ci/bin/generate-go-yaml.py -# rules: -# - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH -# changes: -# - apps/cli/executables/go/**/* -# - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/' -# variables: -# # override DEPLOY_ENV -# DEPLOY_ENV: "test" -# - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' -# variables: -# DEPLOY_ENV: "prod" -# artifacts: -# paths: -# - generated-go-build-pipeline.yml -# -## Trigger child pipeline based on generated go builder yaml -#go child pipeline: -# stage: trigger -# trigger: -# include: -# - artifact: generated-go-build-pipeline.yml -# job: go generate yaml -# strategy: depend -# rules: -# - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH -# changes: -# - apps/cli/executables/go/**/* -# - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/' -# variables: -# # override DEPLOY_ENV -# DEPLOY_ENV: "test" -# - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' -# variables: -# DEPLOY_ENV: "prod" +# Generate PEX builder yaml for child pipeline +pex generate yaml: + stage: generate-yaml + image: python:3.8-slim + before_script: + - apt update && apt install -y git + - pip install pyyaml + script: + - DEPLOY_ENV=${DEPLOY_ENV} ./ci/bin/generate-yaml.py + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + changes: + - apps/cli/executables/pexable/**/* + - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/' + variables: + # override DEPLOY_ENV + DEPLOY_ENV: "test" + - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' + variables: + DEPLOY_ENV: "prod" + artifacts: + paths: + - generated-pex-build-pipeline.yml + +# Trigger child pipeline based on generated PEX builder yaml +pex child pipeline: + stage: trigger + trigger: + include: + - artifact: generated-pex-build-pipeline.yml + job: pex generate yaml + strategy: depend + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + changes: + - apps/cli/executables/pexable/**/* + - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/' + variables: + # override DEPLOY_ENV + DEPLOY_ENV: "test" + - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' + variables: + DEPLOY_ENV: "prod" + +# Generate go builder yaml for child pipeline +go generate yaml: + stage: generate-yaml + image: python:3.8-slim + before_script: + - apt update && apt install -y git + - pip install pyyaml + script: + - DEPLOY_ENV=${DEPLOY_ENV} ./ci/bin/generate-go-yaml.py + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + changes: + - apps/cli/executables/go/**/* + - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/' + variables: + # override DEPLOY_ENV + DEPLOY_ENV: "test" + - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' + variables: + DEPLOY_ENV: "prod" + artifacts: + paths: + - generated-go-build-pipeline.yml + +# Trigger child pipeline based on generated go builder yaml +go child pipeline: + stage: trigger + trigger: + include: + - artifact: generated-go-build-pipeline.yml + job: go generate yaml + strategy: depend + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + changes: + - apps/cli/executables/go/**/* + - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/' + variables: + # override DEPLOY_ENV + DEPLOY_ENV: "test" + - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' + variables: + DEPLOY_ENV: "prod" # Development deploy: -- GitLab