* Make e2e test depend on binary builds
* Search for binary in the correct folders
* Remove package file var
* Add ARCH var
(cherry picked from commit 7bb5a5b318)
This commit is contained in:
@@ -609,7 +609,7 @@ def package_step(edition, ver_mode, include_enterprise2=False, variants=None, is
|
||||
}
|
||||
|
||||
|
||||
def e2e_tests_server_step(edition, port=3001):
|
||||
def grafana_server_step(edition, port=3001):
|
||||
package_file_pfx = ''
|
||||
if edition == 'enterprise2':
|
||||
package_file_pfx = 'grafana' + enterprise2_suffix(edition)
|
||||
@@ -618,9 +618,9 @@ def e2e_tests_server_step(edition, port=3001):
|
||||
|
||||
environment = {
|
||||
'PORT': port,
|
||||
'ARCH': 'linux-amd64'
|
||||
}
|
||||
if package_file_pfx:
|
||||
environment['PACKAGE_FILE'] = 'dist/{}-*linux-amd64.tar.gz'.format(package_file_pfx)
|
||||
environment['RUNDIR'] = 'scripts/grafana-server/tmp-{}'.format(package_file_pfx)
|
||||
|
||||
return {
|
||||
@@ -628,7 +628,9 @@ def e2e_tests_server_step(edition, port=3001):
|
||||
'image': build_image,
|
||||
'detach': True,
|
||||
'depends_on': [
|
||||
'package' + enterprise2_suffix(edition),
|
||||
'build-plugins',
|
||||
'build-backend',
|
||||
'build-frontend',
|
||||
],
|
||||
'environment': environment,
|
||||
'commands': [
|
||||
@@ -644,7 +646,7 @@ def e2e_tests_step(suite, edition, port=3001, tries=None):
|
||||
'name': 'end-to-end-tests-{}'.format(suite) + enterprise2_suffix(edition),
|
||||
'image': 'cypress/included:8.4.1',
|
||||
'depends_on': [
|
||||
'package',
|
||||
'grafana-server',
|
||||
],
|
||||
'environment': {
|
||||
'HOST': 'grafana-server' + enterprise2_suffix(edition),
|
||||
|
||||
Reference in New Issue
Block a user