diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
commit | 3b1af5cc7ed2666ff18b718ce5d30fa5a2756674 (patch) | |
tree | 3bc4a40e0ee51ec27eabf917c537033c0c5b14d4 /spec/lib/gitlab/ci/variables | |
parent | 9bba14be3f2c211bf79e15769cd9b77bc73a13bc (diff) |
Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42
Diffstat (limited to 'spec/lib/gitlab/ci/variables')
-rw-r--r-- | spec/lib/gitlab/ci/variables/builder/pipeline_spec.rb | 81 | ||||
-rw-r--r-- | spec/lib/gitlab/ci/variables/builder_spec.rb | 145 |
2 files changed, 0 insertions, 226 deletions
diff --git a/spec/lib/gitlab/ci/variables/builder/pipeline_spec.rb b/spec/lib/gitlab/ci/variables/builder/pipeline_spec.rb index 0a079a69682..e5324560944 100644 --- a/spec/lib/gitlab/ci/variables/builder/pipeline_spec.rb +++ b/spec/lib/gitlab/ci/variables/builder/pipeline_spec.rb @@ -33,38 +33,6 @@ RSpec.describe Gitlab::Ci::Variables::Builder::Pipeline, feature_category: :secr ]) end - context 'when FF `ci_remove_legacy_predefined_variables` is disabled' do - before do - stub_feature_flags(ci_remove_legacy_predefined_variables: false) - end - - it 'includes all predefined variables in a valid order' do - keys = subject.pluck(:key) - - expect(keys).to contain_exactly(*%w[ - CI_PIPELINE_IID - CI_PIPELINE_SOURCE - CI_PIPELINE_CREATED_AT - CI_COMMIT_SHA - CI_COMMIT_SHORT_SHA - CI_COMMIT_BEFORE_SHA - CI_COMMIT_REF_NAME - CI_COMMIT_REF_SLUG - CI_COMMIT_BRANCH - CI_COMMIT_MESSAGE - CI_COMMIT_TITLE - CI_COMMIT_DESCRIPTION - CI_COMMIT_REF_PROTECTED - CI_COMMIT_TIMESTAMP - CI_COMMIT_AUTHOR - CI_BUILD_REF - CI_BUILD_BEFORE_SHA - CI_BUILD_REF_NAME - CI_BUILD_REF_SLUG - ]) - end - end - context 'when the pipeline is running for a tag' do let(:pipeline) { build(:ci_empty_pipeline, :created, project: project, ref: 'test', tag: true) } @@ -90,40 +58,6 @@ RSpec.describe Gitlab::Ci::Variables::Builder::Pipeline, feature_category: :secr CI_COMMIT_TAG_MESSAGE ]) end - - context 'when FF `ci_remove_legacy_predefined_variables` is disabled' do - before do - stub_feature_flags(ci_remove_legacy_predefined_variables: false) - end - - it 'includes all predefined variables in a valid order' do - keys = subject.pluck(:key) - - expect(keys).to contain_exactly(*%w[ - CI_PIPELINE_IID - CI_PIPELINE_SOURCE - CI_PIPELINE_CREATED_AT - CI_COMMIT_SHA - CI_COMMIT_SHORT_SHA - CI_COMMIT_BEFORE_SHA - CI_COMMIT_REF_NAME - CI_COMMIT_REF_SLUG - CI_COMMIT_MESSAGE - CI_COMMIT_TITLE - CI_COMMIT_DESCRIPTION - CI_COMMIT_REF_PROTECTED - CI_COMMIT_TIMESTAMP - CI_COMMIT_AUTHOR - CI_BUILD_REF - CI_BUILD_BEFORE_SHA - CI_BUILD_REF_NAME - CI_BUILD_REF_SLUG - CI_COMMIT_TAG - CI_COMMIT_TAG_MESSAGE - CI_BUILD_TAG - ]) - end - end end context 'when merge request is present' do @@ -365,21 +299,6 @@ RSpec.describe Gitlab::Ci::Variables::Builder::Pipeline, feature_category: :secr 'CI_COMMIT_TAG_MESSAGE' ) end - - context 'when FF `ci_remove_legacy_predefined_variables` is disabled' do - before do - stub_feature_flags(ci_remove_legacy_predefined_variables: false) - end - - it 'does not expose tag variables' do - expect(subject.to_hash.keys) - .not_to include( - 'CI_COMMIT_TAG', - 'CI_COMMIT_TAG_MESSAGE', - 'CI_BUILD_TAG' - ) - end - end end context 'without a commit' do diff --git a/spec/lib/gitlab/ci/variables/builder_spec.rb b/spec/lib/gitlab/ci/variables/builder_spec.rb index 10974993fa4..6b296924b6d 100644 --- a/spec/lib/gitlab/ci/variables/builder_spec.rb +++ b/spec/lib/gitlab/ci/variables/builder_spec.rb @@ -154,151 +154,6 @@ RSpec.describe Gitlab::Ci::Variables::Builder, :clean_gitlab_redis_cache, featur it { expect(subject.to_runner_variables).to eq(predefined_variables) } - context 'when FF `ci_remove_legacy_predefined_variables` is disabled' do - before do - stub_feature_flags(ci_remove_legacy_predefined_variables: false) - end - - let(:predefined_variables) do - [ - { key: 'CI_JOB_NAME', - value: 'rspec:test 1' }, - { key: 'CI_JOB_NAME_SLUG', - value: 'rspec-test-1' }, - { key: 'CI_JOB_STAGE', - value: job.stage_name }, - { key: 'CI_NODE_TOTAL', - value: '1' }, - { key: 'CI_ENVIRONMENT_NAME', - value: 'test' }, - { key: 'CI_BUILD_NAME', - value: 'rspec:test 1' }, - { key: 'CI_BUILD_STAGE', - value: job.stage_name }, - { key: 'CI', - value: 'true' }, - { key: 'GITLAB_CI', - value: 'true' }, - { key: 'CI_SERVER_URL', - value: Gitlab.config.gitlab.url }, - { key: 'CI_SERVER_HOST', - value: Gitlab.config.gitlab.host }, - { key: 'CI_SERVER_PORT', - value: Gitlab.config.gitlab.port.to_s }, - { key: 'CI_SERVER_PROTOCOL', - value: Gitlab.config.gitlab.protocol }, - { key: 'CI_SERVER_SHELL_SSH_HOST', - value: Gitlab.config.gitlab_shell.ssh_host.to_s }, - { key: 'CI_SERVER_SHELL_SSH_PORT', - value: Gitlab.config.gitlab_shell.ssh_port.to_s }, - { key: 'CI_SERVER_NAME', - value: 'GitLab' }, - { key: 'CI_SERVER_VERSION', - value: Gitlab::VERSION }, - { key: 'CI_SERVER_VERSION_MAJOR', - value: Gitlab.version_info.major.to_s }, - { key: 'CI_SERVER_VERSION_MINOR', - value: Gitlab.version_info.minor.to_s }, - { key: 'CI_SERVER_VERSION_PATCH', - value: Gitlab.version_info.patch.to_s }, - { key: 'CI_SERVER_REVISION', - value: Gitlab.revision }, - { key: 'GITLAB_FEATURES', - value: project.licensed_features.join(',') }, - { key: 'CI_PROJECT_ID', - value: project.id.to_s }, - { key: 'CI_PROJECT_NAME', - value: project.path }, - { key: 'CI_PROJECT_TITLE', - value: project.title }, - { key: 'CI_PROJECT_DESCRIPTION', - value: project.description }, - { key: 'CI_PROJECT_PATH', - value: project.full_path }, - { key: 'CI_PROJECT_PATH_SLUG', - value: project.full_path_slug }, - { key: 'CI_PROJECT_NAMESPACE', - value: project.namespace.full_path }, - { key: 'CI_PROJECT_NAMESPACE_ID', - value: project.namespace.id.to_s }, - { key: 'CI_PROJECT_ROOT_NAMESPACE', - value: project.namespace.root_ancestor.path }, - { key: 'CI_PROJECT_URL', - value: project.web_url }, - { key: 'CI_PROJECT_VISIBILITY', - value: "private" }, - { key: 'CI_PROJECT_REPOSITORY_LANGUAGES', - value: project.repository_languages.map(&:name).join(',').downcase }, - { key: 'CI_PROJECT_CLASSIFICATION_LABEL', - value: project.external_authorization_classification_label }, - { key: 'CI_DEFAULT_BRANCH', - value: project.default_branch }, - { key: 'CI_CONFIG_PATH', - value: project.ci_config_path_or_default }, - { key: 'CI_PAGES_DOMAIN', - value: Gitlab.config.pages.host }, - { key: 'CI_PAGES_URL', - value: project.pages_url }, - { key: 'CI_API_V4_URL', - value: API::Helpers::Version.new('v4').root_url }, - { key: 'CI_API_GRAPHQL_URL', - value: Gitlab::Routing.url_helpers.api_graphql_url }, - { key: 'CI_TEMPLATE_REGISTRY_HOST', - value: template_registry_host }, - { key: 'CI_PIPELINE_IID', - value: pipeline.iid.to_s }, - { key: 'CI_PIPELINE_SOURCE', - value: pipeline.source }, - { key: 'CI_PIPELINE_CREATED_AT', - value: pipeline.created_at.iso8601 }, - { key: 'CI_COMMIT_SHA', - value: job.sha }, - { key: 'CI_COMMIT_SHORT_SHA', - value: job.short_sha }, - { key: 'CI_COMMIT_BEFORE_SHA', - value: job.before_sha }, - { key: 'CI_COMMIT_REF_NAME', - value: job.ref }, - { key: 'CI_COMMIT_REF_SLUG', - value: job.ref_slug }, - { key: 'CI_COMMIT_BRANCH', - value: job.ref }, - { key: 'CI_COMMIT_MESSAGE', - value: pipeline.git_commit_message }, - { key: 'CI_COMMIT_TITLE', - value: pipeline.git_commit_title }, - { key: 'CI_COMMIT_DESCRIPTION', - value: pipeline.git_commit_description }, - { key: 'CI_COMMIT_REF_PROTECTED', - value: (!!pipeline.protected_ref?).to_s }, - { key: 'CI_COMMIT_TIMESTAMP', - value: pipeline.git_commit_timestamp }, - { key: 'CI_COMMIT_AUTHOR', - value: pipeline.git_author_full_text }, - { key: 'CI_BUILD_REF', - value: job.sha }, - { key: 'CI_BUILD_BEFORE_SHA', - value: job.before_sha }, - { key: 'CI_BUILD_REF_NAME', - value: job.ref }, - { key: 'CI_BUILD_REF_SLUG', - value: job.ref_slug }, - { key: 'YAML_VARIABLE', - value: 'value' }, - { key: 'GITLAB_USER_ID', - value: user.id.to_s }, - { key: 'GITLAB_USER_EMAIL', - value: user.email }, - { key: 'GITLAB_USER_LOGIN', - value: user.username }, - { key: 'GITLAB_USER_NAME', - value: user.name } - ].map { |var| var.merge(public: true, masked: false) } - end - - it { expect(subject.to_runner_variables).to eq(predefined_variables) } - end - context 'variables ordering' do def var(name, value) { key: name, value: value.to_s, public: true, masked: false } |