Commit e2d2a5fd authored by Gibbs, Ian's avatar Gibbs, Ian
Browse files

Merge branch 'i0x-main-patch-dbbd' into 'main' 

I0x main patch dbbd

See merge request !58
parents 2bc08da7 0b86853b

.gitlab-ci.yml

+25 −5
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ job_readybake_lint: 
  allow_failure: false

  tags: [ acme-conda-stage.sns.gov ]

  script:

    - docker images -a

    - env | grep READYBAKE_ || true

    - mkdir -p ./readybake_cache

    - docker rmi --force readybake_lint:latest
@@ -86,6 +87,7 @@ job_readybake_rpmbuild: 
  allow_failure: false

  tags: [ acme-conda-stage.sns.gov ]

  script:

    - docker images -a

    - env | grep READYBAKE_ || true

    - mkdir -p ./readybake_cache

    - docker rmi --force readybake_rpmbuild:latest
@@ -117,6 +119,7 @@ job_lint_precommit: 
  allow_failure: true

  tags: [ acme-conda-stage.sns.gov ]

  script:

    - docker images -a

    - |

      read -r container_id <<< $(

        docker create --rm --tty readybake_lint:latest /bin/bash ./entrypoint.sh
@@ -136,6 +139,7 @@ job_lint_rpmspec: 
  allow_failure: false

  tags: [ acme-conda-stage.sns.gov ]

  script:

    - docker images -a

    - |

      read -r container_id <<< $(

        docker create --rm --tty readybake_rpmbuild:latest \
@@ -155,6 +159,7 @@ job_rpmbuild: 
  allow_failure: false

  tags: [ acme-conda-stage.sns.gov ]

  script:

    - docker images -a

    - |

      read -r container_id <<< $(

        docker create --tty readybake_rpmbuild:latest /bin/bash ./entrypoint.sh
@@ -192,6 +197,7 @@ job_tag_validate: 
  allow_failure: false

  tags: [ acme-conda-stage.sns.gov ]

  script:

    - docker images -a

    - pwd

    - |

      ls -lah ./rpmbuild
@@ -234,20 +240,32 @@ job_tag_validate: 
  needs:

    - { job: job_rpmbuild }

  rules:

    - changes:

        compare_to: 'refs/heads/$CI_DEFAULT_BRANCH'

    - if: $CI_COMMIT_BRANCH

      changes:

        compare_to: "refs/heads/main"

        paths:

          - 'rpm/*.spec'

          - 'src/**/*'

      when: on_success

    - when: never



  #

  #   changes:

  #     compare_to: "refs/heads/main"

  #

  # Hardcoded use of 'main' branch necessary

  # 

  # compare_to property does not support variable expansion

  # https://gitlab.com/gitlab-org/gitlab/-/issues/369916

  #





job_tag_release:

  stage: 5_release

  allow_failure: false

  tags: [ acme-conda-stage.sns.gov ]

  script:

    - docker images -a

    - pwd

    - |

      ls -lah ./rpmbuild
@@ -335,7 +353,7 @@ job_tag_release: 
  needs:

    - { job: job_rpmbuild }

  rules:

    - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH'

    - if: '$CI_COMMIT_REF_NAME == "main"'

      changes:

        paths:

          - 'rpm/*.spec'
@@ -349,6 +367,7 @@ job_tag_release: 
  allow_failure: false

  tags: [ acme-conda-stage.sns.gov ]

  script:

    - docker images -a

    - docker rmi --force readybake_lint:latest

    - docker rmi --force readybake_rpmbuild:latest
@@ -382,6 +401,7 @@ job_publish_release: 
    GIT_STRATEGY: clone

  tags: [ scse-runner1 ]

  script:

    - docker images -a

    - pwd

    - |

      ls -lah ./rpmbuild
@@ -435,7 +455,7 @@ job_publish_release: 
  needs:

    - { job: job_tag_release }

  rules:

    - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH'

    - if: '$CI_COMMIT_REF_NAME == "main"'

      changes:

        paths:

          - 'rpm/*.spec'