Skip to content

Commit 933995f

Browse files
authored
Merge pull request #79 from phracek/support_testing_farm_for_nightly
Use Testing Farm for Nightly builds
2 parents 77e0f08 + b4aaabc commit 933995f

File tree

2 files changed

+3
-23
lines changed

2 files changed

+3
-23
lines changed

yaml/jobs/nightly-builds.yaml

+2-22
Original file line numberDiff line numberDiff line change
@@ -47,33 +47,13 @@
4747
branches:
4848
- 'master'
4949
builders:
50-
- prepare-rhscl-images:
51-
restag: '{targetOS}'
5250
- shell: |
53-
#!/bin/bash
54-
set -ex
55-
56-
# Copy sources and prepare shared sources (build scripts)
57-
rsync -avzP -e 'ssh -F ssh_config' $(pwd)/ host:sources
58-
if [[ $? -ne 0 ]]; then
59-
rm ticket ssh_config
60-
fi
61-
62-
- shell: |
63-
#!/bin/bash
64-
set -ex
65-
66-
# Generate sources, commit changes into generated branch and show diff
67-
ssh -F ssh_config host 'set -ex; \
68-
git config --global user.name "SCLorg Jenkins"; \
69-
git config --global user.email "[email protected]"'
51+
yum install -y curl jq
7052
7153
# Run make for base image and for each dependent image
72-
timeout 5h ssh -F ssh_config host 'set -ex; \
73-
cd sources; bash daily_tests/daily_scl_tests.sh {os} {tests}'
54+
timeout 7h cd ci_scripts; bash daily_tests/daily_scl_tests.sh {os} {tests}
7455
7556
publishers:
7657
- send-email:
7758
os: '{os}'
7859
tests: '{tests}'
79-
- release-vm

yaml/publishers/send-email.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
ssh -F ssh_config host 'set -ex; \
1515
cd sources; \
1616
python3 ./send_results.py \
17-
/tmp/daily_scl_tests/results {os}-{tests} \
17+
/tmp/daily_scl_tests-{os}-{tests}/results {os}-{tests} \
1818
1919
2020
# Wait two seconds before cleaning machine.

0 commit comments

Comments
 (0)