Unverified Commit 537e8db8 authored by Bolea Sanchez, Vicente Adolfo's avatar Bolea Sanchez, Vicente Adolfo Committed by GitHub
Browse files

Merge pull request #3635 from vicentebolea/tweaks-crusher-build 

ci,crusher: minor tweaks
parents 1e5ebec5 731616ff

.gitlab/config/generate_pipelines.py

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ parser.add_argument( 
    '-d', '--days', type=int, default=1,

    help='How many days back to search for commits')

parser.add_argument(

    '-m', '--max', type=int, default=3,

    '-m', '--max', type=int, default=2,

    help='Maximum amount of pipelines computed')

parser.add_argument(

    '-f', '--template_file', required=True,

.gitlab/gitlab-ci-ascent.yml

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ sync-github-prs: 
  only:

    - schedules

  variables:

    GIT_STRATEGY: none

    CUSTOM_CI_BUILDS_DIR: "/gpfs/wolf/csc303/scratch/vbolea/ci/adios2"

  script:

    - export PATH="/gpfs/wolf/csc303/scratch/vbolea/ci/utils:$PATH"

scripts/ci/gitlab-ci/setup-vars.sh

+2 −0
Original line number Diff line number Diff line
@@ -38,4 +38,6 @@ then 
  ci_original_sha=$(git rev-parse "${CI_COMMIT_REF}^2")

  export CI_ORIGINAL_SHA="$ci_original_sha"

  export CI_UPDATE_ARGS="-DCTEST_UPDATE_VERSION_OVERRIDE=${CI_ORIGINAL_SHA}"

else

  export CI_ORIGINAL_SHA="${CI_COMMIT_REF}"

fi