Revamp scripts and tests to allow for easy addition of different docker images

Author: elssar

.travis.yml

@@ -5,16 +5,11 @@ node_js:
 services:
   - docker
 
-before_install:
-  - docker build -t postman/newman_ubuntu1404 ./ubuntu_1404
-
 install:
   - npm install
 
 script:
   - npm test
-  - docker run -v $PWD/tests/data:/etc/newman -t postman/newman_ubuntu1404 -c HTTPBinNewmanTest.json.postman_collection -e HTTPBinNewmanTestEnv.json.postman_environment --exitCode
-  - docker run -t postman/newman_ubuntu1404 -u https://www.getpostman.com/collections/8a0c9bc08f062d12dcda --exitCode
 
 after_success:
   - echo "All done!"

ubuntu_1404/.dockerignore renamed to images/ubuntu1404/.dockerignore

@@ -3,7 +3,11 @@
   "version": "2.1.1",
   "description": "This repository contains the Dockerfiles and tests for the Newman Docker images.",
   "scripts": {
-    "test": "mocha tests/*-spec.js"
+    "docker-build": "./scripts/docker/docker-build.sh",
+    "docker-test": "./scripts/docker/docker-test.sh",
+    "test": "./scripts/test/test.sh",
+    "test-docker": "./scripts/test/test-docker.sh",
+    "test-infra": "./scripts/test/test-infra.sh"
   },
   "repository": {
     "type": "git",

ubuntu_1404/Dockerfile renamed to images/ubuntu1404/Dockerfile

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e;
+
+IMAGES_BASE_PATH="./images";
+
+function build_docker_image {
+    TAG=$(grep -oP "(?<=ENV\ NEWMAN_VERSION\ ).+" ${1}/Dockerfile);
+    BASENAME=$(basename $1);
+    docker build -t postman/newman_${BASENAME}:${TAG} ${1};
+}
+
+if [ -z "$1" ]; then
+    for image in $IMAGES_BASE_PATH/*; do
+        if [ -d "${image}" ] && [ -f "${image}/Dockerfile" ]; then
+            build_docker_image ${image};
+        fi
+    done
+else
+    if [ -d "${IMAGES_BASE_PATH}/${1}" ] && [ -f "${IMAGES_BASE_PATH}/${1}/Dockerfile" ]; then
+        build_docker_image ${IMAGES_BASE_PATH}/${1};
+    else
+        echo "Invalid image";
+        exit 1;
+    fi
+fi

ubuntu_1404/README.md renamed to images/ubuntu1404/README.md

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e;
+
+IMAGES_BASE_PATH="./images";
+
+function test_docker_image {
+    TAG=$(grep -oP "(?<=ENV\ NEWMAN_VERSION\ ).+" ${1}/Dockerfile);
+    BASENAME=$(basename $1);
+
+    docker run -v $PWD/test/data:/etc/newman -t postman/newman_${BASENAME}:${TAG} \
+        -c HTTPBinNewmanTest.json.postman_collection \
+        -e HTTPBinNewmanTestEnv.json.postman_environment \
+        --exitCode;
+
+    docker run -t postman/newman_${BASENAME}:${TAG} \
+        -u https://www.getpostman.com/collections/8a0c9bc08f062d12dcda \
+        --exitCode;
+}
+
+if [ -z "$1" ]; then
+    for image in $IMAGES_BASE_PATH/*; do
+        if [ -d "${image}" ] && [ -f "${image}/Dockerfile" ]; then
+            test_docker_image ${image};
+        fi
+    done
+else
+    if [ -d "${IMAGES_BASE_PATH}/${1}" ] && [ -f "${IMAGES_BASE_PATH}/${1}/Dockerfile" ]; then
+        test_docker_image ${IMAGES_BASE_PATH}/${1};
+    else
+        echo "Invalid image";
+        exit 1;
+    fi
+fi

package.json

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# stop on first error
+set -e;
+
+echo -e "\n\n\033[93mBuilding docker images...\033[0m";
+npm run docker-build;
+
+echo -e "\n\n\033[93mTesting docker images...\033[0m";
+npm run docker-test;

scripts/docker/docker-build.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# stop on first error
+set -e;
+
+echo -e "\n\n\033[93mRunning infrastructure tests...\033[0m";
+echo -e "\033[0m\033[2mmocha `mocha --version`\033[0m";
+
+# run mocha tests
+mocha test/infra/**/*.test.js --recursive;

scripts/docker/docker-test.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e;
+
+echo    "";
+echo    "      ,-————,";
+echo    "     / _____ \\";
+echo    "    ( | >   | )";
+echo    "     \\   —   /";
+echo    "      \`—————‘";
+echo    "";
+
+echo "Newman Docker Tests";
+
+# run infra tests
+npm run test-infra;
+
+# run docker tests
+npm run test-docker;

scripts/test/test-docker.sh

@@ -9,17 +9,21 @@ var expect = require('expect.js'),
 
 /* global describe, it */
 describe('Validate Dockerfiles', function () {
-    var versions = ['ubuntu_1404'],
+    var imagesBaseDirectory = path.join(__dirname, '../../images'),
+        versions = fs.readdirSync(imagesBaseDirectory).filter(function (item) {
+            return fs.statSync(path.join(imagesBaseDirectory, item)).isDirectory();
+        }),
         rules = fs.readFileSync(path.join(__dirname, 'dockerfile_rules.yml')),
-        validator = new DockerFileValidator(rules); // TODO: Decide how we want to automatically load versions.
+        validator = new DockerFileValidator(rules);
 
     versions.map(function (version) {
-        var dockerFilePath = path.join(__dirname, '..', version, 'Dockerfile'),
+        var dockerFilePath = path.join(imagesBaseDirectory, version, 'Dockerfile'),
             dockerFileContent = fs.readFileSync(dockerFilePath);
 
         it('Docker file for "' + version + '" must be valid', function () {
             var result = validator.validate(dockerFileContent.toString()),
                 numBadThings = result.error.count + result.warn.count;
+
             if (!(numBadThings == 0)) {
                 console.log(JSON.stringify(result, null, 4)); // Helps debugging on the CI
             }