Commit 84ba0d08 authored by Peter Hutterer's avatar Peter Hutterer
Browse files

globals.yml: drop the script cycling



I think this stems from an earlier approach where we needed to check that
the different scripts would run. But since they all produced the same file,
I'm not sure how we'd check the script was indeed run correctly.

Anyway, let's drop this for now.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent 9d4f5c09
......@@ -23,7 +23,7 @@ stages:
.ci-commons-alpine:
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: '.hidden_dir/test.sh /test_file'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
FDO_EXPIRES_AFTER: '1h'
.ci-commons-alpine@x86_64:
......
......@@ -23,7 +23,7 @@ stages:
.ci-commons-arch:
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: '/bin/bash test/script.sh'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
FDO_EXPIRES_AFTER: '1h'
.ci-commons-arch@x86_64:
......
......@@ -23,7 +23,7 @@ stages:
.ci-commons-centos:
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: './test/script.sh'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
FDO_DISTRIBUTION_VERSION: '7'
FDO_EXPIRES_AFTER: '1h'
......
......@@ -23,7 +23,7 @@ stages:
.ci-commons-fedora:
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: '.hidden_dir/test.sh /test_file'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
FDO_DISTRIBUTION_VERSION: '32'
FDO_EXPIRES_AFTER: '1h'
......
......@@ -23,7 +23,7 @@ stages:
.ci-commons-ubuntu:
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: '/bin/bash test/script.sh'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
FDO_DISTRIBUTION_VERSION: '19.10'
FDO_EXPIRES_AFTER: '1h'
......
......@@ -49,16 +49,6 @@ if __name__ == '__main__':
ci_folder = Path('.gitlab-ci')
ci_folder.mkdir(exist_ok=True)
# define a generator for the list of scripts to be run in each distribution
def get_script():
n = 0
while True:
yield globs['scripts'][n]
n += 1
n %= len(globs['scripts'])
scripts = get_script()
# and render each distribution in the templates source directory
for distrib, config in sorted(config_data.items()):
# load our distribution template
......@@ -69,9 +59,6 @@ if __name__ == '__main__':
dest = out_folder / f'{distrib}.yml'
dest_ci = ci_folder / f'{distrib}-ci.yml'
# use the next script for this config
config['script'] = next(scripts)
print(f'generating {dest}')
with open(dest, 'w') as out_stream:
template.stream(config).dump(out_stream)
......
## @scripts: list of scripts to be tested against in CI
##
## distros should not overwrite this list, it has a special global meaning
scripts:
- '.hidden_dir/test.sh /test_file'
- '/bin/bash test/script.sh'
- './test/script.sh'
- 'sh test/script.sh'
## @bootstrap_tag: the current image tag associated with this bootstrap image
bootstrap_tag: '2020-10-30.1'
......
......@@ -24,7 +24,7 @@ stages:
.ci-commons-{{distribution}}:
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: '{{script}}'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
{% if not fixed_version %}
FDO_DISTRIBUTION_VERSION: '{{versions[0]}}'
{% endif %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment