MCLOUD-5603: [Investigation] Build images on travis for testing (#190)

BaDos · web-flow · commit 64609c3b9858 · 2020-04-14T11:13:21.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,7 @@ language: php
 stages:
   - static-unit
   - integration
+  - build-images
   - test
 
 jobs:
@@ -47,6 +48,29 @@ jobs:
       php: '7.3'
       env:
         - TEST_SUITE=integration
+    - stage: build-images
+      env:
+        - TEST_SUITE=build-images
+      script:
+        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh tls; fi;
+        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh varnish; fi;
+        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh elasticsearch; fi;
+        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh nginx; fi;
+    - script:
+        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.1-cli; fi;
+        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.1-fpm; fi;
+      env:
+        - TEST_SUITE=build-images
+    - script:
+        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.2-cli; fi;
+        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.2-fpm; fi;
+      env:
+        - TEST_SUITE=build-images
+    - script:
+        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.3-cli; fi;
+        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.3-fpm; fi;
+      env:
+        - TEST_SUITE=build-images
     - stage: test
       php: '7.1'
       dist: xenial
@@ -60,10 +84,12 @@ jobs:
       env:
         - TEST_SUITE=functional
 
-install: composer update
+install: if [[ $TEST_SUITE != "build-images" ]]; then composer update; fi;
 
 before_script:
-  - sudo sysctl -w vm.max_map_count=262144
+  - if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "build-images" ]; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; fi;
+  - if [ $TEST_SUITE == "functional" ]; then sudo sysctl -w vm.max_map_count=262144; fi;
+  - if [ $TEST_SUITE == "functional" ]; then cp codeception.dist.yml codeception.yml && sed -i "s/use_generated_images:\ false/use_generated_images:\ true/" codeception.yml; fi;
 
 script:
   - if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "functional" ]; then ./tests/travis/functional.sh; fi;
diff --git a/codeception.dist.yml b/codeception.dist.yml
@@ -24,6 +24,8 @@ modules:
       composer_magento_username: "%REPO_USERNAME%"
       composer_magento_password: "%REPO_PASSWORD%"
       composer_github_token: "%GITHUB_TOKEN%"
+      use_generated_images: false
+      version_generated_images: "%TRAVIS_BUILD_NUMBER%"
       printOutput: false
     Magento\CloudDocker\Test\Functional\Codeception\Docker:
       system_magento_dir: "%Magento.docker.settings.system.magento_dir%"
diff --git a/images/redis/3.2/Dockerfile b/images/redis/3.2/Dockerfile
diff --git a/images/redis/4.0/Dockerfile b/images/redis/4.0/Dockerfile
diff --git a/images/redis/5.0/Dockerfile b/images/redis/5.0/Dockerfile
diff --git a/src/Test/Functional/Acceptance/AbstractCest.php b/src/Test/Functional/Acceptance/AbstractCest.php
@@ -31,7 +31,7 @@ public function _before(\CliTester $I): void
         $I->addDependencyToComposer('magento/magento-cloud-docker', '1.1.99');
 
         $I->addEceToolsGitRepoToComposer();
-        $I->addDependencyToComposer('magento/ece-tools', 'dev-develop as 2002.01.99');
+        $I->addDependencyToComposer('magento/ece-tools', 'dev-develop as 2002.1.99');
 
         $I->composerUpdate();
     }
diff --git a/src/Test/Functional/Acceptance/AcceptanceCest.php b/src/Test/Functional/Acceptance/AcceptanceCest.php
@@ -21,6 +21,7 @@ class AcceptanceCest extends AbstractCest
     public function testProductionMode(\CliTester $I): void
     {
         $I->runEceDockerCommand('build:compose --mode=production');
+        $I->replaceImagesWithGenerated();
         $I->startEnvironment();
         $I->runDockerComposeCommand('run build cloud-build');
         $I->runDockerComposeCommand('run deploy cloud-deploy');
@@ -43,6 +44,7 @@ public function testCustomHost(\CliTester $I): void
             $I->runEceDockerCommand('build:compose --mode=production --host=magento2.test --port=8080'),
             'Command build:compose failed'
         );
+        $I->replaceImagesWithGenerated();
         $I->startEnvironment();
         $I->assertTrue($I->runDockerComposeCommand('run build cloud-build'), 'Build phase failed');
         $I->assertTrue($I->runDockerComposeCommand('run deploy cloud-deploy'), 'Deploy phase failed');
diff --git a/src/Test/Functional/Acceptance/ElasticsearchCest.php b/src/Test/Functional/Acceptance/ElasticsearchCest.php
@@ -41,6 +41,7 @@ public function testElasticsearch(CliTester $I, Example $data)
             $command .= " --es-env-var={$data['param']['key']}={$data['param']['value']}";
         }
         $I->runEceDockerCommand($command);
+        $I->replaceImagesWithGenerated();
         $I->startEnvironment();
         $I->runDockerComposeCommand('exec -T elasticsearch ps aux | grep elasticsearch');
         $I->seeInOutput('-Xms' . $data['xms']);
diff --git a/src/Test/Functional/Acceptance/SplitDbCest.php b/src/Test/Functional/Acceptance/SplitDbCest.php
@@ -62,6 +62,7 @@ public function testSplitDbOnProductionMode(\CliTester $I): void
             $I->getExposedPort(MagentoDb::KEY_DB_QUOTE),
             $I->getExposedPort(MagentoDb::KEY_DB_SALES)
         ));
+        $I->replaceImagesWithGenerated();
         $I->startEnvironment();
         $I->runDockerComposeCommand('run build cloud-build');
         $I->runDockerComposeCommand('run deploy cloud-deploy');
diff --git a/tests/functional/Codeception/TestInfrastructure.php b/tests/functional/Codeception/TestInfrastructure.php
@@ -390,6 +390,33 @@ public function runEceDockerCommand(string $command): bool
             ->wasSuccessful();
     }
 
+    /**
+     * Replace magento images with cloud FT images in docker-compose.yml
+     *
+     * @return bool
+     */
+    public function replaceImagesWithGenerated(): bool
+    {
+
+        if (true === $this->_getConfig('use_generated_images')) {
+            $this->debug('Tests use new generatedx Docker images');
+            $path = $this->getWorkDirPath() . DIRECTORY_SEPARATOR . 'docker-compose.yml';
+
+            return (bool)file_put_contents(
+                $path,
+                preg_replace(
+                    '/(magento\/magento-cloud-docker-(\w+)):((\d+\.\d+|latest)(\-fpm|\-cli)?(\-\d+\.\d+))/i',
+                    'cloudft/$2:$4$5-' . $this->_getConfig('version_generated_images'),
+                    file_get_contents($path)
+                )
+            );
+        }
+
+        $this->debug('Tests use default Docker images');
+
+        return true;
+    }
+
     /**
      * Runs composer update
      *
diff --git a/tests/travis/images.sh b/tests/travis/images.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+set -e
+trap '>&2 echo Error: Command \`$BASH_COMMAND\` on line $LINENO failed with exit code $?' ERR
+
+function build_push_image() {
+  image_name="$1:$2"
+  docker build -t "$image_name" "$3"
+  docker push "$image_name"
+}
+
+function run() {
+    service_name="$1"
+    service_version="$2"
+
+    if [[ $service_name == "tls" ]]; then
+        build_push_image "cloudft/tls" "latest-$TRAVIS_BUILD_NUMBER" "./images/tls"
+    else
+        if [[ "$service_version" != "" ]]; then
+            build_push_image "cloudft/$service_name" "$service_version-$TRAVIS_BUILD_NUMBER" "./images/$service_name/$service_version"
+        else
+            latest_version=""
+            for service_version in $(ls -1 "./images/$service_name" | sort --version-sort)
+            do
+                if [[ $service_version == "cli" ]] || [[ $service_version == "fpm" ]]; then continue; fi;
+                build_push_image "cloudft/$service_name" "$service_version-$TRAVIS_BUILD_NUMBER" "./images/$service_name/$service_version"
+                latest_version="$service_version"
+            done
+
+            if [[ $service_name != "elasticsearch" ]] && [[ $service_name != "php" ]] && [[ $latest_version != "" ]]; then
+                build_push_image "cloudft/$service_name" "latest-$TRAVIS_BUILD_NUMBER" "./images/$service_name/$latest_version"
+            fi
+        fi
+    fi
+}
+
+if [[ $# -gt 0 ]]; then
+    run $1 $2
+else
+    echo "Your command line contains no arguments"
+    exit 1
+fi

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function _before(\CliTester $I): void`
`31`	`31`	`$I->addDependencyToComposer('magento/magento-cloud-docker', '1.1.99');`
`32`	`32`
`33`	`33`	`$I->addEceToolsGitRepoToComposer();`
`34`		`- $I->addDependencyToComposer('magento/ece-tools', 'dev-develop as 2002.01.99');`
	`34`	`+ $I->addDependencyToComposer('magento/ece-tools', 'dev-develop as 2002.1.99');`
`35`	`35`
`36`	`36`	`$I->composerUpdate();`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ public function testElasticsearch(CliTester $I, Example $data)`
`41`	`41`	`$command .= " --es-env-var={$data['param']['key']}={$data['param']['value']}";`
`42`	`42`	`}`
`43`	`43`	`$I->runEceDockerCommand($command);`
	`44`	`+ $I->replaceImagesWithGenerated();`
`44`	`45`	`$I->startEnvironment();`
`45`	`46`	`$I->runDockerComposeCommand('exec -T elasticsearch ps aux \| grep elasticsearch');`
`46`	`47`	`$I->seeInOutput('-Xms' . $data['xms']);`