Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Neon Components for OpenQA
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Sysadmin
Neon Components for OpenQA
Commits
c5d1d6fc
Commit
c5d1d6fc
authored
Jun 14, 2017
by
Harald Sitter
🎶
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move all the bins around
parent
f9b18a84
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
16 deletions
+22
-16
Jenkinsfile
Jenkinsfile
+1
-1
bin/bootstrap.rb
bin/bootstrap.rb
+7
-13
bin/bootstrap_from_ubuntu.sh
bin/bootstrap_from_ubuntu.sh
+1
-1
bin/contain.rb
bin/contain.rb
+0
-0
bin/run.rb
bin/run.rb
+13
-1
No files found.
Jenkinsfile
View file @
c5d1d6fc
...
...
@@ -9,7 +9,7 @@ cleanNode('master') {
git
'https://github.com/apachelogger/kde-os-autoinst'
}
stage
(
'run'
)
{
sh
'./contain.rb /workspace/bootstrap.rb'
sh
'./contain.rb /workspace/b
in/b
ootstrap.rb'
}
}
finally
{
archiveArtifacts
'wok/testresults/*.png, wok/testresults/*.json, wok/ulogs/*, wok/video.ogv'
...
...
bootstrap.rb
→
b
in/b
ootstrap.rb
View file @
c5d1d6fc
...
...
@@ -19,6 +19,10 @@
# You should have received a copy of the GNU Lesser General Public
# License along with this library. If not, see <http://www.gnu.org/licenses/>.
require_relative
'../lib/paths'
Dir
.
chdir
(
File
.
dirname
(
__dir__
))
# go into working dir
deps
=
%w[libtheora-dev libopencv-dev libfftw3-dev libsndfile1-dev pkg-config
libtool autoconf automake build-essential
git]
...
...
@@ -37,10 +41,7 @@ end
# system('git clone --depth 1 https://github.com/os-autoinst/os-autoinst-needles-opensuse.git opensuse-needles') || raise
# end
perldir
=
nil
Dir
.
chdir
(
'os-autoinst'
)
do
perldir
=
"
#{
Dir
.
pwd
}
/perl5"
system
(
'autoreconf -f -i'
)
||
raise
system
(
'./configure'
)
||
raise
system
(
'make'
)
||
raise
...
...
@@ -49,7 +50,7 @@ Dir.chdir('os-autoinst') do
system
(
'apt install --no-install-recommends -y carton'
)
||
raise
## builddeps
system
(
'apt install --no-install-recommends -y libxml2-dev libssh2-1-dev libdbus-1-dev'
)
||
raise
unless
system
(
"cpanm --installdeps --no-sudo --local-lib-contained
#{
perldir
}
--notest ."
)
unless
system
(
"cpanm --installdeps --no-sudo --local-lib-contained
#{
PERL5DIR
}
--notest ."
)
Dir
.
glob
(
"
#{
Dir
.
home
}
/.cpanm/work/*/build.log"
).
each
do
|
log
|
5
.
times
{
puts
}
puts
"-----------------
#{
log
}
-----------------"
...
...
@@ -58,16 +59,9 @@ Dir.chdir('os-autoinst') do
raise
'capnm install failed'
end
end
ENV
[
'PERL5LIB'
]
=
"
#{
perldir
}
/lib/perl5/"
# VM runner and run.rb helpers.
system
(
'apt install -y kvm qemu zsync'
)
||
raise
system
(
'apt install -y kvm qemu zsync
kmod
'
)
||
raise
system
(
'bin/sync.rb'
)
||
raise
exec
(
'./run.rb;'
)
## testi
exit
system
(
'apt install --y qemu'
)
# system('carton install') || raise/
# system('carton exec yolo') || raise
exec
(
'bin/run.rb'
)
bootstrap_from_ubuntu.sh
→
b
in/b
ootstrap_from_ubuntu.sh
View file @
c5d1d6fc
...
...
@@ -3,4 +3,4 @@
apt update
apt
install
-y
ruby
sudo
ruby-dev wget gnupg2
exec
.
/bootstrap.rb
exec
bin
/bootstrap.rb
contain.rb
→
bin/
contain.rb
View file @
c5d1d6fc
File moved
run.rb
→
bin/
run.rb
View file @
c5d1d6fc
...
...
@@ -22,7 +22,10 @@
require
'fileutils'
require
'json'
require_relative
'lib/junit'
require_relative
'../lib/junit'
require_relative
'../lib/paths'
ENV
[
'PERL5LIB'
]
=
PERL5LIB
# not a typo 鑊!
FileUtils
.
rm_r
(
'wok'
)
if
File
.
exist?
(
'wok'
)
...
...
@@ -45,9 +48,18 @@ config = {
PRODUCTDIR
:
'/workspace/neon'
,
QEMUVGA
:
'cirrus'
,
TESTDEBUG
:
true
,
MAKETESTSNAPSHOTS
:
false
,
QEMUCPUS
:
cpus
}
if
Dir
.
exist?
(
'../raid'
)
config
[
:BOOT_HDD_IMAGE
]
=
true
config
[
:KEEPHDDS
]
=
true
# FIXME: should probably be mv when JOB_NAME is set to be faster in a CI
# context
FileUtils
.
cp_r
(
'../raid'
,
'.'
,
verbose:
true
)
end
# Neon builders don't do KVM, disable it if the module is not loaded.
config
[
:QEMU_NO_KVM
]
=
true
unless
system
(
'lsmod | grep -q kvm_intel'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment