Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchCourrier
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Harbor Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchCourrier
Commits
99ef1f59
Commit
99ef1f59
authored
4 years ago
by
Florian Azizian
Browse files
Options
Downloads
Patches
Plain Diff
FIX #11895 TIME 0:40 Test E2E
parent
735dd7c6
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
ci/docker_install_php.sh
+8
-1
8 additions, 1 deletion
ci/docker_install_php.sh
with
9 additions
and
2 deletions
.gitlab-ci.yml
+
1
−
1
View file @
99ef1f59
...
@@ -58,9 +58,9 @@ job_e2e:
...
@@ -58,9 +58,9 @@ job_e2e:
-
npm install
-
npm install
-
npm run build-prod
-
npm run build-prod
-
apt-get install -yqq openjdk-11-jdk
-
apt-get install -yqq openjdk-11-jdk
# - apt-get install -yqq firefox
-
sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
-
sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
-
curl -o /dev/null --silent --head --write-out '%{http_code}\n' http://127.0.0.1/MaarchCourrier
-
curl -o /dev/null --silent --head --write-out '%{http_code}\n' http://127.0.0.1/MaarchCourrier
-
firefox --version
-
npm run ee-launch
-
npm run ee-launch
allow_failure
:
true
allow_failure
:
true
only
:
only
:
...
...
This diff is collapsed.
Click to expand it.
ci/docker_install_php.sh
+
8
−
1
View file @
99ef1f59
...
@@ -18,4 +18,11 @@ apt-get install -y libpq-dev libxml2-dev libxslt1-dev libpng-dev unoconv xpdf-ut
...
@@ -18,4 +18,11 @@ apt-get install -y libpq-dev libxml2-dev libxslt1-dev libpng-dev unoconv xpdf-ut
&&
curl
--silent
--show-error
--location
--fail
--retry
3
--output
/tmp/firefox.tar.bz2
$ACTUAL_URL
\
&&
curl
--silent
--show-error
--location
--fail
--retry
3
--output
/tmp/firefox.tar.bz2
$ACTUAL_URL
\
&&
tar
-xvjf
/tmp/firefox.tar.bz2
-C
/opt
\
&&
tar
-xvjf
/tmp/firefox.tar.bz2
-C
/opt
\
&&
ln
-s
/opt/firefox/firefox /usr/local/bin/firefox
\
&&
ln
-s
/opt/firefox/firefox /usr/local/bin/firefox
\
&&
firefox
--version
&&
a2enmod rewrite
\
&&
touch
directory.txt
\
&&
echo
"<Directory /var/www/html>"
>>
directory.txt
\
&&
echo
"Options Indexes FollowSymLinks"
>>
directory.txt
\
&&
echo
"AllowOverride All"
>>
directory.txt
\
&&
echo
"Require all granted"
>>
directory.txt
\
&&
echo
"</Directory>"
>>
directory.txt
\
&&
sed
-i
-e
'/CustomLog/r directory.txt'
/etc/apache2/sites-available/000-default.conf
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