diff --git a/docker.spec b/docker.spec index ab0b399..311a099 100644 --- a/docker.spec +++ b/docker.spec @@ -39,7 +39,7 @@ # docker %global git_docker https://github.com/projectatomic/docker -%global commit_docker f43d177f0c4673fc17abfcd3c9c125e44dfe797e +%global commit_docker 4032bd5e2da3872c02a59afe29505141bd8d0640 %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7}) # docker_branch used in %%check %global docker_branch docker-1.13.1 @@ -84,12 +84,12 @@ # docker-proxy %global git_libnetwork https://github.com/docker/libnetwork -%global commit_libnetwork 1ba81943c93f535fe2ac141d981ba476acf847c2 +%global commit_libnetwork 2bf63300c52f5ea61989f85c732f00097d746530 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) # tini %global git_tini https://github.com/krallin/tini -%global commit_tini 0effd37412ba5ae7e00af0db1f36f5dbc1671df9 +%global commit_tini 5b117de7f824f3d3825737cf09581645abbe35d4 %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{repo} @@ -97,7 +97,7 @@ Name: %{repo} Epoch: 2 %endif Version: 1.13.1 -Release: 47.git%{shortcommit_docker}%{?dist} +Release: 48.git%{shortcommit_docker}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -1027,6 +1027,16 @@ exit 0 %{_unitdir}/%{repo}-lvm-plugin.* %changelog +* Tue Mar 20 2018 Lokesh Mandvekar - 2:1.13.1-48.git4032bd5 +- built docker @projectatomic/docker-1.13.1 commit 4032bd5 +- built docker-novolume-plugin commit 385ec70 +- built rhel-push-plugin commit af9107b +- built docker-lvm-plugin commit 8647404 +- built docker-runc @projectatomic/docker-1.13.1 commit edfbe37 +- built docker-containerd @projectatomic/docker-1.13.1 commit 375cb68 +- built docker-init commit 5b117de +- built libnetwork commit 2bf6330 + * Thu Feb 15 2018 Lokesh Mandvekar - 2:1.13.1-47.gitf43d177 - built docker @projectatomic/docker-1.13.1 commit f43d177 - built docker-novolume-plugin commit 385ec70 diff --git a/tests/.gitignore b/tests/.gitignore deleted file mode 100644 index 5b683d8..0000000 --- a/tests/.gitignore +++ /dev/null @@ -1 +0,0 @@ -artifacts* diff --git a/tests/autotest-installed/files/control.ini.j2 b/tests/autotest-installed/files/control.ini.j2 deleted file mode 100644 index db8975c..0000000 --- a/tests/autotest-installed/files/control.ini.j2 +++ /dev/null @@ -1,31 +0,0 @@ -[Control] -include = -# run/run_passwd : Fedora image does not include /bin/passwd -# run_exec/exec_pid_count : Fedora image does not include 'find' command -# info : Ugh. Fedora image (correctly) defaults to overlay2 -# but backing fs is extfs, not the expected xfs. -# systemd_in_container : Just plain doesn't work. Figure it out another day. -exclude = pretest_example,intratest_example,posttest_example,example,subexample - ,docker_cli/run/run_passwd - ,docker_cli/run_exec/exec_pid_count - ,docker_cli/info - ,docker_cli/systemd_in_container - {{ excluded_tests }} -subthings = -pretests = pretests -subtests = subtests -intratests = intratests -posttests = posttests - -[Bugzilla] -url = -username = -password = -excluded = -key_field = status_whiteboard -key_match = docker-autotest - -[Query] -product = Red Hat Enterprise Linux 7 -component = docker -status = NEW, ASSIGNED, POST, MODIFIED, ON_DEV diff --git a/tests/autotest-installed/files/defaults.ini.j2 b/tests/autotest-installed/files/defaults.ini.j2 deleted file mode 100644 index e61505e..0000000 --- a/tests/autotest-installed/files/defaults.ini.j2 +++ /dev/null @@ -1,15 +0,0 @@ -[DEFAULTS] -config_version = 0.8.4 -autotest_version = @!NOVERSIONCHECK!@ -docker_path = /usr/bin/docker -docker_options = -daemon_options = daemon,--selinux-enabled,--storage-driver,devicemapper,--storage-opt,dm.fs=xfs,--storage-opt,dm.thinpooldev=/dev/mapper/atomicos-docker--pool,--icc=false -docker_timeout = 600 -__example__ = docker_repo_name, docker_repo_tag, preserve_fqins, preserve_cnames -docker_repo_name = fedora -docker_repo_tag = latest -docker_registry_host = docker.io -docker_registry_user = -remove_after_test = yes -preserve_fqins = docker.io/stackbrew/centos:7,docker.io/stackbrew/centos:centos7,docker.io/stackbrew/centos:latest,registry-1.docker.io/distribution/registry:2.1 -preserve_cnames = ,dummy_container_name diff --git a/tests/autotest-installed/files/tests.ini.j2 b/tests/autotest-installed/files/tests.ini.j2 deleted file mode 100644 index ba4e6ae..0000000 --- a/tests/autotest-installed/files/tests.ini.j2 +++ /dev/null @@ -1,12 +0,0 @@ -# Custom test configs for Fedora CI setup - -[docker_cli/cp/every_last] -# Fedora image includes python3, but not python. -# This is the only setting we need to override... -python_path = python3 -# ...but we need to duplicate everything else from the default -# config.ini anyway -exclude_paths = "/dev", "/proc", "/sys", "/tmp", "/run/secrets" -exclude_symlinks = yes -__example__ = max_files -max_files = 100 diff --git a/tests/autotest-installed/tasks/main.yml b/tests/autotest-installed/tasks/main.yml deleted file mode 100644 index 23ebce9..0000000 --- a/tests/autotest-installed/tasks/main.yml +++ /dev/null @@ -1,68 +0,0 @@ ---- - -# git repos: autotest, then autotest-docker underneath. -# [We can't use the ansible git module because Atomic doesn't include git] -- name: download and extract git tarballs - unarchive: - src: https://github.com/autotest/{{ item.name }}/archive/master.tar.gz - dest: "/var/lib{{ item.subdir }}" - extra_opts: ["--transform=s;^{{ item.name }}-master;{{ item.dirname }};"] - remote_src: true - with_items: - - name: autotest - subdir: - dirname: autotest - - name: autotest-docker - subdir: /autotest/client/tests - dirname: docker - -# If git isn't present on system (i.e. Atomic Host), disable subtest that -# requires it -- name: Check if git exists - stat: path=/usr/bin/git - register: git_stat - -- name: Disable build/git_path test if git is missing - set_fact: - excluded_tests: "{{ excluded_tests }},docker_cli/build/git_path" - when: git_stat.stat.exists == False - -# bz1498281 : oci-umount misses one instance of /var/lib/docker/overlay2 -# This bug is not getting attention, so in the interests of making CI -# pass, let's just disable the test. -- name: bz1498281 workaround - check installed version of docker - command: rpm -q docker - register: docker_rpm - -- name: bz1498281 workaround - disable oci_umount test on certain dockers - set_fact: - excluded_tests: "{{ excluded_tests }},docker_cli/run_volumes/oci_umount" - when: docker_rpm.stdout.find("docker-1.13.1-") != -1 - -# 2017-11-15: this is a stumper. 'docker export | docker import' fails with: -# Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running? -# ...but only when run on Fedora Atomic via dynamic inventory--not when -# run on a preconfigured virt (e.g. OpenStack). I've spent too much time -# unsuccessfully trying to track it down. Disabling, with some trepidation, -# in the interests of getting CI to pass. FIXME. -- name: import_export test fails only on some instances of Atomic - set_fact: - excluded_tests: "{{ excluded_tests }},docker_cli/import_export/simple" - tags: atomic - -- name: debug - list of additional subtests to exclude - debug: var=excluded_tests - -# custom control files define the subtests we run or don't run, their -# config settings, and the docker images we use for testing -- name: autotest-docker | custom config - action: template src="files/{{ item }}.j2" - dest="/var/lib/autotest/client/tests/docker/config_custom/{{ item }}" - with_items: - - control.ini - - defaults.ini - - tests.ini - -# docker is started -- name: start docker - service: name=docker state=started enabled=yes diff --git a/tests/test_docker_autotest.sh b/tests/test_docker_autotest.sh deleted file mode 100755 index 82a342c..0000000 --- a/tests/test_docker_autotest.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# -# Simple wrapper for docker-autotest; runs it, then -# logs status in the format expected by CI -# - -set -e -cd /var/lib/autotest/client >/dev/null - -rm -f log.full -./autotest-local run docker >& log.full - -# We write "FAIL " here on any failure; or PASS if all OK -TEST_LOG=test.log -rm -f $TEST_LOG - -# Look for FAIL or ERROR lines in final result -rc=0 -while read status subtest rest -do - case "$status" in - FAIL) echo "FAIL $subtest" >>$TEST_LOG; rc=1;; - ERROR) echo "FAIL $subtest" >>$TEST_LOG; rc=1 ;; - esac -done < results/default/status - -if [ $rc -eq 0 ]; then - echo PASS docker-autotest >$TEST_LOG -fi - -exit $rc diff --git a/tests/test_docker_autotest.yml b/tests/test_docker_autotest.yml deleted file mode 100644 index c9def38..0000000 --- a/tests/test_docker_autotest.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- hosts: localhost - vars: - - artifacts: ./artifacts - excluded_tests: "" - tags: - - classic - - atomic - roles: - - role: autotest-installed - - tasks: - - block: - - name: Run test - script: ./test_docker_autotest.sh - always: - - name: Pull out logs - fetch: - src: "/var/lib/autotest/client/{{ item.remote_path }}" - dest: "{{ artifacts }}/{{ item.localname }}" - flat: yes - with_items: - - remote_path: test.log - localname: test.log - - remote_path: results/default/debug/client.DEBUG - localname: test.debug.log diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 51c0c49..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1 +0,0 @@ -- import_playbook: test_docker_autotest.yml