Container build improvements:

* More optimized container suite that greatly improves build time. * Added static Debian packages for Devel::Cover to reduce build time. * Add deprecated state for containers. Deprecated containers may only be used to build packages. * Remove Debian 8 from CI because it does not provide additional coverage over Ubuntu 14.04 and Ubuntu 16.04.
pgbackrest · Jun 24, 2017 · 7a9b1f6 · 7a9b1f6
1 parent 53184a7
commit 7a9b1f6
Show file tree

Hide file tree

Showing 20 changed files with 408 additions and 707 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,6 @@ services:
 env:
   - PGB_TEST_VM="co6" PGB_TEST_PARAM=""
   - PGB_TEST_VM="u16" PGB_TEST_PARAM=" --no-lint"
-  - PGB_TEST_VM="d8" PGB_TEST_PARAM=" --no-lint"
   - PGB_TEST_VM="co7" PGB_TEST_PARAM=" --no-lint"
   - PGB_TEST_VM="u14" PGB_TEST_PARAM=" --no-lint"
 
@@ -31,10 +30,8 @@ before_install:
     aws help --version
     aws configure list
   - |
-    # Build Devel::Cover
-    git clone https://anonscm.debian.org/git/pkg-perl/packages/libdevel-cover-perl.git ~/libdevel-cover-perl
-    cd ~/libdevel-cover-perl && git checkout debian/1.23-2 && debuild -i -us -uc -b
-    sudo dpkg -i ~/libdevel-cover-perl_1.23-2_amd64.deb
+    # Install Devel::Cover
+    sudo dpkg -i ${TRAVIS_BUILD_DIR?}/test/package/u14-libdevel-cover-perl_1.23-2_amd64.deb
     /usr/bin/cover -v
 
 install:

diff --git a/doc/xml/release.xml b/doc/xml/release.xml
@@ -263,7 +263,23 @@
                     </release-item>
 
                     <release-item>
-                        <p>Remove <proper>Ubuntu 12.04</proper> from CI now that it is EOL (it can still be run manually).</p>
+                        <p>More optimized container suite that greatly improves build time.</p>
+                    </release-item>
+
+                    <release-item>
+                        <p>Added static Debian packages for <code>Devel::Cover</code> to reduce build time.</p>
+                    </release-item>
+
+                    <release-item>
+                        <p>Add <id>deprecated</id> state for containers.  Deprecated containers may only be used to build packages.</p>
+                    </release-item>
+
+                    <release-item>
+                        <p>Deprecate <proper>Ubuntu 12.04</proper> now that it is EOL.</p>
+                    </release-item>
+
+                    <release-item>
+                        <p>Remove <proper>Debian 8</proper> from CI because it does not provide additional coverage over <proper>Ubuntu 14.04</proper> and <proper>Ubuntu 16.04</proper>.</p>
                     </release-item>
 
                     <release-item>

diff --git a/doc/xml/user-guide.xml b/doc/xml/user-guide.xml
@@ -71,7 +71,7 @@
 
         <variable key="host-db-master">db-master</variable>
         <variable key="host-db-master-user">{[host-user]}</variable>
-        <variable key="host-db-master-image">{[image-repo]}:{[host-os]}-db-{[pg-version]}-doc</variable>
+        <variable key="host-db-master-image">{[image-repo]}:{[host-os]}-doc-db</variable>
         <variable key="host-db-master-mount">{[host-mount]}</variable>
 
         <variable key="host-db-standby">db-standby</variable>
@@ -81,7 +81,7 @@
 
         <variable key="host-backup">backup</variable>
         <variable key="host-backup-user">{[host-user]}</variable>
-        <variable key="host-backup-image">{[image-repo]}:{[host-os]}-backup-doc-pre</variable>
+        <variable key="host-backup-image">{[image-repo]}:{[host-os]}-doc-backup</variable>
         <variable key="host-backup-mount">{[host-mount]}</variable>
 
         <!-- Commands for various operations -->

diff --git a/test/.gitignore b/test/.gitignore
@@ -1,6 +1,5 @@
 test
 .vagrant
-package
 nytprof*
 scratch.txt
 coverage*

diff --git a/test/Vagrantfile b/test/Vagrantfile
@@ -61,12 +61,8 @@ Vagrant.configure(2) do |config|
             >> /home/ubuntu/.profile
 
         #---------------------------------------------------------------------------------------------------------------------------
-        echo 'Build Devel::Cover' && date
-        apt-get install -y libpod-coverage-perl libtest-differences-perl libhtml-parser-perl libtemplate-perl
-        git clone --branch debian/1.23-2 \
-            https://anonscm.debian.org/git/pkg-perl/packages/libdevel-cover-perl.git /root/libdevel-cover-perl
-        cd /root/libdevel-cover-perl && debuild --no-lintian -i -us -uc -b > /dev/null
-        dpkg -i /root/libdevel-cover-perl_1.23-2_amd64.deb
+        echo 'Install Devel::Cover' && date
+        dpkg -i /backrest/test/package/u16-libdevel-cover-perl_1.23-2_amd64.deb
 
         #---------------------------------------------------------------------------------------------------------------------------
         echo 'Install Docker' && date

diff --git a/test/lib/pgBackRestTest/Common/CiTest.pm b/test/lib/pgBackRestTest/Common/CiTest.pm
@@ -115,10 +115,8 @@ sub process
         "    aws help --version\n" .
         "    aws configure list\n" .
         "  - |\n" .
-        "    # Build Devel::Cover\n" .
-        "    git clone https://anonscm.debian.org/git/pkg-perl/packages/libdevel-cover-perl.git ~/libdevel-cover-perl\n" .
-        '    cd ~/libdevel-cover-perl && git checkout debian/' . LIB_COVER_VERSION . " && debuild -i -us -uc -b\n" .
-        '    sudo dpkg -i ~/' . LIB_COVER_PACKAGE . "\n" .
+        "    # Install Devel::Cover\n" .
+        "    sudo dpkg -i \${TRAVIS_BUILD_DIR?}/test/package/u14-" . LIB_COVER_PACKAGE . "\n" .
         '    ' . LIB_COVER_EXE . " -v\n" .
         "\n" .
         "install:\n" .