Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openairinterface5G
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Bin He
openairinterface5G
Commits
db66552f
Commit
db66552f
authored
5 years ago
by
frtabu
Browse files
Options
Downloads
Patches
Plain Diff
modify ci to allow running without apt cacher (default behavior of enforcing apt-cacher unchanged)
parent
5edb3e36
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ci-scripts/oai-ci-vm-tool
+1
-0
1 addition, 0 deletions
ci-scripts/oai-ci-vm-tool
ci-scripts/runTestOnVM.sh
+2
-2
2 additions, 2 deletions
ci-scripts/runTestOnVM.sh
with
3 additions
and
2 deletions
ci-scripts/oai-ci-vm-tool
+
1
−
0
View file @
db66552f
...
@@ -157,6 +157,7 @@ function setvar_usage {
...
@@ -157,6 +157,7 @@ function setvar_usage {
declare
-A
HELP_VAR
declare
-A
HELP_VAR
HELP_VAR[
"VM_OSREL"
]=
"OS release to use in virtual machines"
HELP_VAR[
"VM_OSREL"
]=
"OS release to use in virtual machines"
HELP_VAR[
"RUN_EXPERIMENTAL"
]=
"Enforce execution of variants with EXPERIMENTAL variable set to
\"
true
\"
"
HELP_VAR[
"RUN_EXPERIMENTAL"
]=
"Enforce execution of variants with EXPERIMENTAL variable set to
\"
true
\"
"
HELP_VAR[
"OPTIONAL_APTCACHER"
]=
"build and Run tests will fail if apt-cacher not installed and this variable not set to
\"
true
\"
"
echo
"--setvar_<varname> <value> where varname is one of:"
echo
"--setvar_<varname> <value> where varname is one of:"
for
i
in
${
AUTHORIZED_VAR
[@]
}
;
do
printf
"%20s : %s
\n
"
"
$i
"
"
${
HELP_VAR
[
$i
]
}
"
;
done
for
i
in
${
AUTHORIZED_VAR
[@]
}
;
do
printf
"%20s : %s
\n
"
"
$i
"
"
${
HELP_VAR
[
$i
]
}
"
;
done
}
}
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/runTestOnVM.sh
+
2
−
2
View file @
db66552f
...
@@ -476,7 +476,7 @@ function install_epc_on_vm {
...
@@ -476,7 +476,7 @@ function install_epc_on_vm {
local
LOC_EPC_VM_IP_ADDR
=
`
uvt-kvm ip
$LOC_EPC_VM_NAME
`
local
LOC_EPC_VM_IP_ADDR
=
`
uvt-kvm ip
$LOC_EPC_VM_NAME
`
echo
"
$LOC_EPC_VM_NAME
has for IP addr =
$LOC_EPC_VM_IP_ADDR
"
echo
"
$LOC_EPC_VM_NAME
has for IP addr =
$LOC_EPC_VM_IP_ADDR
"
scp
-o
StrictHostKeyChecking
=
no /etc/apt/apt.conf.d/01proxy ubuntu@
$LOC_EPC_VM_IP_ADDR
:/home/ubuntu
[
-f
/etc/apt/apt.conf.d/01proxy
]
&&
scp
-o
StrictHostKeyChecking
=
no /etc/apt/apt.conf.d/01proxy ubuntu@
$LOC_EPC_VM_IP_ADDR
:/home/ubuntu
# ltebox specific actions (install and start)
# ltebox specific actions (install and start)
LTE_BOX_TO_INSTALL
=
1
LTE_BOX_TO_INSTALL
=
1
...
@@ -500,7 +500,7 @@ function install_epc_on_vm {
...
@@ -500,7 +500,7 @@ function install_epc_on_vm {
echo
"############################################################"
echo
"############################################################"
echo
"Install EPC on EPC VM (
$LOC_EPC_VM_NAME
)"
echo
"Install EPC on EPC VM (
$LOC_EPC_VM_NAME
)"
echo
"############################################################"
echo
"############################################################"
echo
"sudo cp 01proxy /etc/apt/apt.conf.d/"
>
$LOC_EPC_VM_CMDS
echo
"sudo
[ -f 01proxy ] &&
cp 01proxy /etc/apt/apt.conf.d/"
>
$LOC_EPC_VM_CMDS
echo
"touch /home/ubuntu/.hushlogin"
>>
$LOC_EPC_VM_CMDS
echo
"touch /home/ubuntu/.hushlogin"
>>
$LOC_EPC_VM_CMDS
echo
"echo
\"
sudo apt-get --yes --quiet install zip openjdk-8-jre libconfuse-dev libreadline-dev liblog4c-dev libgcrypt-dev libsctp-dev python2.7 python2.7-dev daemon iperf
\"
"
>>
$LOC_EPC_VM_CMDS
echo
"echo
\"
sudo apt-get --yes --quiet install zip openjdk-8-jre libconfuse-dev libreadline-dev liblog4c-dev libgcrypt-dev libsctp-dev python2.7 python2.7-dev daemon iperf
\"
"
>>
$LOC_EPC_VM_CMDS
echo
"sudo apt-get update > zip-install.txt 2>&1"
>>
$LOC_EPC_VM_CMDS
echo
"sudo apt-get update > zip-install.txt 2>&1"
>>
$LOC_EPC_VM_CMDS
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment