[Git][noosfero/noosfero][master] 3 commits: Removes 'Jessie' tag from CI config

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
168e103d by Gabriel Silva at 2018-01-11T14:25:06-02:00
Removes 'Jessie' tag from CI config

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>

- - - - -
e5005d0a by Gabriel Silva at 2018-01-11T14:35:07-02:00
Adds repository key every build

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>

- - - - -
a0bc6f92 by Rodrigo Souto at 2018-01-11T17:51:24+00:00
Merge branch 'ci_tag' into 'master'

Removes 'Jessie' tag from CI config

See merge request noosfero/noosfero!1374
- - - - -


2 changed files:

- .gitlab-ci.yml
- script/install-dependencies/debian-jessie.sh


Changes:

=====================================
.gitlab-ci.yml
=====================================
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,79 +18,62 @@ stages:
 .retriable-template: &retriable
   retry: 2
 
-.tags-template: &tags
-  tags:
-    - jessie
-
 specs-models:
   <<: *retriable
-  <<: *tags
   script: bundle exec rake spec SPEC=spec/models
   stage: all-tests
 
 api:
   <<: *retriable
-  <<: *tags
   script: bundle exec rake test:api
   stage: all-tests
 
 units:
   <<: *retriable
-  <<: *tags
   script: bundle exec rake test:units
   stage: all-tests
 
 functionals:
   <<: *retriable
-  <<: *tags
   script: bundle exec rake test:functionals
   stage: all-tests
 
 integration:
   <<: *retriable
-  <<: *tags
   script: bundle exec rake test:integration
   stage: all-tests
 
 cucumber-1:
   <<: *retriable
-  <<: *tags
   script: SLICE=1/2 bundle exec rake cucumber
   stage: all-tests
 cucumber-2:
   <<: *retriable
-  <<: *tags
   script: SLICE=2/2 bundle exec rake cucumber
   stage: all-tests
 
 selenium-1:
   <<: *retriable
-  <<: *tags
   script: SLICE=1/6 bundle exec rake selenium
   stage: all-tests
 selenium-2:
   <<: *retriable
-  <<: *tags
   script: SLICE=2/6 bundle exec rake selenium
   stage: all-tests
 selenium-3:
   <<: *retriable
-  <<: *tags
   script: SLICE=3/6 bundle exec rake selenium
   stage: all-tests
 selenium-4:
   <<: *retriable
-  <<: *tags
   script: SLICE=4/6 bundle exec rake selenium
   stage: all-tests
 selenium-5:
   <<: *retriable
-  <<: *tags
   script: SLICE=5/6 bundle exec rake selenium
   stage: all-tests
 selenium-6:
   <<: *retriable
-  <<: *tags
   script: SLICE=6/6 bundle exec rake selenium
   stage: all-tests
 
@@ -98,26 +81,21 @@ selenium-6:
 # probably because of rubygems-integration
 plugins-1:
   <<: *retriable
-  <<: *tags
   script: SLICE=1/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-2:
   <<: *retriable
-  <<: *tags
   script: SLICE=2/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-3:
   <<: *retriable
-  <<: *tags
   script: SLICE=3/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-4:
   <<: *retriable
-  <<: *tags
   script: SLICE=4/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-5:
   <<: *retriable
-  <<: *tags
   script: SLICE=5/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests


=====================================
script/install-dependencies/debian-jessie.sh
=====================================
--- a/script/install-dependencies/debian-jessie.sh
+++ b/script/install-dependencies/debian-jessie.sh
@@ -7,8 +7,9 @@ if ! grep -q "$binary_packages" /etc/apt/sources.list.d/noosfero.list; then
 $binary_packages
 $source_packages
 EOF
+fi
 
-  sudo apt-key add - <<EOF
+sudo apt-key add - <<EOF
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQENBFo9LwwBCACthrtkJxzKTfG1zL32IWDqemvdWwnfgLFBkZ7yr4lKy5dDIK1m
@@ -41,7 +42,6 @@ CdUuv9egEIjH82viVMIjV67mxx0ifpRgIZsbktJvgElOqEzA8xxydU2NHUoVc6jb
 =JjJa
 -----END PGP PUBLIC KEY BLOCK-----
 EOF
-fi
 
 
 if test -f tmp/debian/Release.gpg; then



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/da51c58682339d38979f3031ae1828464878d319...a0bc6f92225f8d8b1a5fb000e15d89ca2a498172

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/da51c58682339d38979f3031ae1828464878d319...a0bc6f92225f8d8b1a5fb000e15d89ca2a498172
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180111/aefcd9a6/attachment-0001.html>