diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-07-04 03:22:19 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-07-04 18:18:36 +0800 |
commit | 4d9c2bad369d510877dff719d94a5f98b1ee4dfe (patch) | |
tree | c9ae9423d847e6916b74ac8210c7534aedd24f05 | |
parent | 8a0cd7dd1560c78fd1cd9fda363dc73bf8ee2010 (diff) | |
download | gitlab-ce-4d9c2bad369d510877dff719d94a5f98b1ee4dfe.tar.gz |
Fix config path
-rw-r--r-- | app/models/ci/pipeline.rb | 2 | ||||
-rw-r--r-- | app/services/ci/create_pipeline_service.rb | 2 | ||||
-rw-r--r-- | spec/models/ci/build_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index a38c63e9e91..dd6fbfbd01b 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -331,7 +331,7 @@ module Ci @ci_yaml_file = begin project.repository.gitlab_ci_yml_for(sha) - rescue Rugged::ReferenceError, GRPC::NotFound + rescue Rugged::ReferenceError, GRPC::NotFound, GRPC::Internal self.yaml_errors = "Failed to load CI/CD config file at #{project.ci_config_file_for_pipeline}" nil diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index 4f35255fb53..b95c26560ae 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -33,7 +33,7 @@ module Ci unless pipeline.config_processor unless pipeline.ci_yaml_file - return error("Missing #{pipeline.ci_yaml_file_path} file") + return error("Missing #{project.ci_config_file_for_pipeline} file") end return error(pipeline.yaml_errors, save: save_on_errors) end diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index e5fd549f0d7..1553d6d3a9a 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -1179,7 +1179,7 @@ describe Ci::Build, :models do { key: 'CI_PROJECT_NAMESPACE', value: project.namespace.full_path, public: true }, { key: 'CI_PROJECT_URL', value: project.web_url, public: true }, { key: 'CI_PIPELINE_ID', value: pipeline.id.to_s, public: true }, - { key: 'CI_CONFIG_PATH', value: pipeline.ci_yaml_file_path, public: true }, + { key: 'CI_CONFIG_PATH', value: project.ci_config_file_for_pipeline, public: true }, { key: 'CI_REGISTRY_USER', value: 'gitlab-ci-token', public: true }, { key: 'CI_REGISTRY_PASSWORD', value: build.token, public: false }, { key: 'CI_REPOSITORY_URL', value: build.repo_url, public: false } |