diff options
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | spec/factories/ci/job_artifacts.rb | 2 | ||||
| -rw-r--r-- | spec/models/ci/deleted_object_spec.rb | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index e62de4bc6dc..8adeef714b1 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -13,6 +13,9 @@ .if-jh: &if-jh if: '$CI_PROJECT_PATH =~ /^gitlab-(jh|cn)\/.*/' +.if-force-ci: &if-force-ci + if: '$FORCE_GITLAB_CI' + .if-default-refs: &if-default-refs if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable(-ee)?$/ || $CI_COMMIT_REF_NAME =~ /^\d+-\d+-auto-deploy-\d+$/ || $CI_COMMIT_REF_NAME =~ /^security\// || $CI_MERGE_REQUEST_IID || $CI_COMMIT_TAG || $FORCE_GITLAB_CI' @@ -481,6 +484,7 @@ - <<: *if-dot-com-gitlab-org-default-branch changes: *code-qa-patterns - <<: *if-dot-com-gitlab-org-schedule + - <<: *if-force-ci .build-images:rules:build-assets-image: rules: @@ -777,6 +781,9 @@ allow_failure: true - <<: *if-dot-com-gitlab-org-schedule allow_failure: true + - <<: *if-force-ci + when: manual + allow_failure: true .qa:rules:package-and-qa:feature-flags: rules: diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb index 223de873a04..12d81910154 100644 --- a/spec/factories/ci/job_artifacts.rb +++ b/spec/factories/ci/job_artifacts.rb @@ -7,7 +7,7 @@ FactoryBot.define do file_format { :zip } trait :expired do - expire_at { Date.yesterday } + expire_at { Time.current.yesterday.change(minute: 9) } end trait :remote_store do diff --git a/spec/models/ci/deleted_object_spec.rb b/spec/models/ci/deleted_object_spec.rb index cb8911d5027..a19c1b76708 100644 --- a/spec/models/ci/deleted_object_spec.rb +++ b/spec/models/ci/deleted_object_spec.rb @@ -22,7 +22,7 @@ RSpec.describe Ci::DeletedObject, :aggregate_failures do expect(deleted_artifact.file_store).to eq(artifact.file_store) expect(deleted_artifact.store_dir).to eq(artifact.file.store_dir.to_s) expect(deleted_artifact.file_identifier).to eq(artifact.file_identifier) - expect(deleted_artifact.pick_up_at).to eq(artifact.expire_at) + expect(deleted_artifact.pick_up_at).to be_like_time(artifact.expire_at) end end |