Skip to content

Commit 8629378

Browse files
committed
WIP: test oparin base_ref
1 parent d54bf23 commit 8629378

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

lib/manageiq/cross_repo/runner.rb

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,17 @@ def run_tests
5757
end
5858

5959
def env_vars
60-
{"MANAGEIQ_REPO" => core_repo.path.to_s, "BUNDLE_PATH" => bundle_path.to_s, "TEST_SUITE" => test_suite}
60+
{
61+
"MANAGEIQ_REPO" => core_repo.path.to_s,
62+
"BUNDLE_PATH" => bundle_path.to_s,
63+
"TEST_SUITE" => test_suite,
64+
"CI" => "true",
65+
"GITHUB_BASE_REF" => "oparin", # TODO: test_repo.base_ref,
66+
"GITHUB_REF_NAME" => test_repo.ref || test_repo.sha,
67+
"GITHUB_REPOSITORY" => test_repo.identifier,
68+
"GITHUB_REPOSITORY_OWNER" => test_repo.org,
69+
"GITHUB_SERVER_URL" => "https://github.com"
70+
}
6171
end
6272

6373
def with_test_env
@@ -113,6 +123,8 @@ def run_test_script(test_script)
113123
w.write(test_script)
114124
w.close
115125

126+
puts "** AG: #{env_vars.inspect}"
127+
116128
system!(env_vars, "/bin/bash -s", :in => r, :out => $stdout, :err => $stderr)
117129
end
118130
end

lib/manageiq/cross_repo/runner/github.rb

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,6 @@ def self.available?
1313

1414
private
1515

16-
def env_vars
17-
super.merge(
18-
"CI" => "true",
19-
"GITHUB_BASE_REF" => nil, # TODO: test_repo.base_ref,
20-
"GITHUB_REF_NAME" => test_repo.ref || test_repo.sha,
21-
"GITHUB_REPOSITORY" => test_repo.identifier,
22-
"GITHUB_REPOSITORY_OWNER" => test_repo.org,
23-
"GITHUB_SERVER_URL" => "https://github.com"
24-
)
25-
end
26-
2716
def ci_config
2817
github_config = YAML.load_file(CONFIG_FILE)
2918

0 commit comments

Comments
 (0)