From 293af14a79914a6294daa9e176e0036e89618ddc Mon Sep 17 00:00:00 2001 From: Hideki Saito Date: Thu, 2 Jun 2022 08:47:46 +0900 Subject: [PATCH] 2022-06-02-00 --- .azure-pipelines/azure-pipelines.yml | 378 ++++++++++-------- .../integration/targets/mount/tasks/main.yml | 17 +- tests/utils/shippable/remote.sh | 1 - tests/utils/shippable/shippable.sh | 6 +- 4 files changed, 225 insertions(+), 177 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 927b877..c1dfc51 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -43,94 +43,118 @@ pool: Standard stages: ## Docker -# - stage: Docker_devel -# displayName: Docker devel -# dependsOn: [] -# jobs: -# - template: templates/matrix.yml -# parameters: -# testFormat: devel/linux/{0}/1 -# targets: -# - name: CentOS 7 -# test: centos7 -# - name: Fedora 35 -# test: fedora35 -# - name: Fedora 36 -# test: fedora36 -# - name: openSUSE 15 py3 -# test: opensuse15 -# - name: Ubuntu 20.04 -# test: ubuntu2004 -# - name: Ubuntu 22.04 -# test: ubuntu2204 -# - stage: Docker_2_13 -# displayName: Docker 2.13 -# dependsOn: [] -# jobs: -# - template: templates/matrix.yml -# parameters: -# testFormat: 2.13/linux/{0}/1 -# targets: -# - name: CentOS 7 -# test: centos7 -# - name: Fedora 34 -# test: fedora34 -# - name: Fedora 35 -# test: fedora35 -# - name: openSUSE 15 py3 -# test: opensuse15 -# - name: Ubuntu 18.04 -# test: ubuntu1804 -# - name: Ubuntu 20.04 -# test: ubuntu2004 -# - stage: Docker_2_12 -# displayName: Docker 2.12 -# dependsOn: [] -# jobs: -# - template: templates/matrix.yml -# parameters: -# testFormat: 2.12/linux/{0}/1 -# targets: -# - name: CentOS 6 -# test: centos6 -# - name: CentOS 7 -# test: centos7 -# - name: Fedora 33 -# test: fedora33 -# - name: Fedora 34 -# test: fedora34 -# - name: openSUSE 15 py2 -# test: opensuse15py2 -# - name: openSUSE 15 py3 -# test: opensuse15 -# - name: Ubuntu 18.04 -# test: ubuntu1804 -# - name: Ubuntu 20.04 -# test: ubuntu2004 -# - stage: Docker_2_11 -# displayName: Docker 2.11 -# dependsOn: [] -# jobs: -# - template: templates/matrix.yml -# parameters: -# testFormat: 2.11/linux/{0}/1 -# targets: -# - name: CentOS 6 -# test: centos6 -# - name: CentOS 7 -# test: centos7 -# - name: Fedora 32 -# test: fedora32 -# - name: Fedora 33 -# test: fedora33 -# - name: openSUSE 15 py2 -# test: opensuse15py2 -# - name: openSUSE 15 py3 -# test: opensuse15 -# - name: Ubuntu 18.04 -# test: ubuntu1804 -# - name: Ubuntu 20.04 -# test: ubuntu2004 + - stage: Docker_devel + displayName: Docker devel + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: devel/linux/{0} + targets: + - name: CentOS 7 + test: centos7 + - name: Fedora 35 + test: fedora35 + - name: Fedora 36 + test: fedora36 + - name: openSUSE 15 py3 + test: opensuse15 + - name: Ubuntu 20.04 + test: ubuntu2004 + - name: Ubuntu 22.04 + test: ubuntu2204 + - stage: Docker_2_13 + displayName: Docker 2.13 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.13/linux/{0}/1 + targets: + - name: CentOS 7 + test: centos7 + - name: Fedora 34 + test: fedora34 + - name: Fedora 35 + test: fedora35 + - name: openSUSE 15 py3 + test: opensuse15 + - name: Ubuntu 18.04 + test: ubuntu1804 + - name: Ubuntu 20.04 + test: ubuntu2004 + - stage: Docker_2_12 + displayName: Docker 2.12 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.12/linux/{0}/1 + targets: + - name: CentOS 6 + test: centos6 + - name: CentOS 7 + test: centos7 + - name: Fedora 33 + test: fedora33 + - name: Fedora 34 + test: fedora34 + - name: openSUSE 15 py2 + test: opensuse15py2 + - name: openSUSE 15 py3 + test: opensuse15 + - name: Ubuntu 18.04 + test: ubuntu1804 + - name: Ubuntu 20.04 + test: ubuntu2004 + - stage: Docker_2_11 + displayName: Docker 2.11 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.11/linux/{0}/1 + targets: + - name: CentOS 6 + test: centos6 + - name: CentOS 7 + test: centos7 + - name: Fedora 32 + test: fedora32 + - name: Fedora 33 + test: fedora33 + - name: openSUSE 15 py2 + test: opensuse15py2 + - name: openSUSE 15 py3 + test: opensuse15 + - name: Ubuntu 18.04 + test: ubuntu1804 + - name: Ubuntu 20.04 + test: ubuntu2004 + - stage: Docker_2_10 + displayName: Docker 2.10 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.10/linux/{0}/1 + targets: + - name: CentOS 6 + test: centos6 + - name: CentOS 7 + test: centos7 + - name: Fedora 30 + test: fedora30 + - name: Fedora 31 + test: fedora31 + - name: openSUSE 15 py2 + test: opensuse15py2 + - name: openSUSE 15 py3 + test: opensuse15 + - name: Ubuntu 16.04 + test: ubuntu1604 + - name: Ubuntu 18.04 + test: ubuntu1804 - stage: Docker_2_9 displayName: Docker 2.9 dependsOn: [] @@ -157,78 +181,92 @@ stages: test: ubuntu1804 ## Remote -# - stage: Remote_devel -# displayName: Remote devel -# dependsOn: [] -# jobs: -# - template: templates/matrix.yml -# parameters: -# testFormat: devel/{0}/1 -# targets: -# - name: MacOS 12.0 -# test: macos/12.0 -# - name: RHEL 7.9 -# test: rhel/7.9 -# - name: RHEL 8.6 -# test: rhel/8.6 -# - name: RHEL 9.0 -# test: rhel/9.0 -# - name: FreeBSD 12.3 -# test: freebsd/12.3 -# - name: FreeBSD 13.1 -# test: freebsd/13.1 -# - stage: Remote_2_13 -# displayName: Remote 2.13 -# dependsOn: [] -# jobs: -# - template: templates/matrix.yml -# parameters: -# testFormat: 2.13/{0}/1 -# targets: -# - name: MacOS 12.0 -# test: macos/12.0 -# - name: RHEL 7.9 -# test: rhel/7.9 -# - name: RHEL 8.5 -# test: rhel/8.5 -# - name: FreeBSD 12.3 -# test: freebsd/12.3 -# - name: FreeBSD 13.0 -# test: freebsd/13.0 -# - stage: Remote_2_12 -# displayName: Remote 2.12 -# dependsOn: [] -# jobs: -# - template: templates/matrix.yml -# parameters: -# testFormat: 2.12/{0}/1 -# targets: -# - name: MacOS 11.1 -# test: macos/11.1 -# - name: RHEL 7.9 -# test: rhel/7.9 -# - name: RHEL 8.4 -# test: rhel/8.4 -# - name: FreeBSD 12.2 -# test: freebsd/12.2 -# - name: FreeBSD 13.0 -# test: freebsd/13.0 -# - stage: Remote_2_11 -# displayName: Remote 2.11 -# dependsOn: [] -# jobs: -# - template: templates/matrix.yml -# parameters: -# testFormat: 2.11/{0}/1 -# targets: -# - name: MacOS 11.1 -# test: macos/11.1 -# - name: RHEL 7.9 -# test: rhel/7.9 -# - name: RHEL 8.3 -# test: rhel/8.3 -# - name: FreeBSD 12.2 -# test: freebsd/12.2 + - stage: Remote_devel + displayName: Remote devel + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: devel/{0}/1 + targets: + - name: MacOS 12.0 + test: macos/12.0 + - name: RHEL 7.9 + test: rhel/7.9 + - name: RHEL 8.6 + test: rhel/8.6 + - name: RHEL 9.0 + test: rhel/9.0 + - name: FreeBSD 12.3 + test: freebsd/12.3 + - name: FreeBSD 13.1 + test: freebsd/13.1 + - stage: Remote_2_13 + displayName: Remote 2.13 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.13/{0}/1 + targets: + - name: MacOS 12.0 + test: macos/12.0 + - name: RHEL 7.9 + test: rhel/7.9 + - name: RHEL 8.5 + test: rhel/8.5 + - name: FreeBSD 12.3 + test: freebsd/12.3 + - name: FreeBSD 13.0 + test: freebsd/13.0 + - stage: Remote_2_12 + displayName: Remote 2.12 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.12/{0}/1 + targets: + - name: MacOS 11.1 + test: macos/11.1 + - name: RHEL 7.9 + test: rhel/7.9 + - name: RHEL 8.4 + test: rhel/8.4 + - name: FreeBSD 12.2 + test: freebsd/12.2 + - name: FreeBSD 13.0 + test: freebsd/13.0 + - stage: Remote_2_11 + displayName: Remote 2.11 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.11/{0}/1 + targets: + - name: MacOS 11.1 + test: macos/11.1 + - name: RHEL 7.9 + test: rhel/7.9 + - name: RHEL 8.3 + test: rhel/8.3 + - name: FreeBSD 12.2 + test: freebsd/12.2 + - stage: Remote_2_10 + displayName: Remote 2.10 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.10/{0}/1 + targets: + - name: OS X 10.11 + test: osx/10.11 + - name: RHEL 7.9 + test: rhel/7.9 + - name: RHEL 8.2 + test: rhel/8.2 - stage: Remote_2_9 displayName: Remote 2.9 dependsOn: [] @@ -237,6 +275,8 @@ stages: parameters: testFormat: 2.9/{0}/1 targets: + - name: OS X 10.11 + test: osx/10.11 - name: RHEL 7.9 test: rhel/7.9 - name: RHEL 8.1 @@ -249,13 +289,15 @@ stages: dependsOn: - Remote_2_9 - Docker_2_9 -# - Remote_2_11 -# - Docker_2_11 -# - Remote_2_12 -# - Docker_2_12 -# - Remote_2_13 -# - Docker_2_13 -# - Remote_devel -# - Docker_devel + - Remote_2_10 + - Docker_2_10 + - Remote_2_11 + - Docker_2_11 + - Remote_2_12 + - Docker_2_12 + - Remote_2_13 + - Docker_2_13 + - Remote_devel + - Docker_devel jobs: - template: templates/coverage.yml diff --git a/tests/integration/targets/mount/tasks/main.yml b/tests/integration/targets/mount/tasks/main.yml index 72b3ac6..be1850f 100644 --- a/tests/integration/targets/mount/tasks/main.yml +++ b/tests/integration/targets/mount/tasks/main.yml @@ -219,7 +219,7 @@ - name: Create fstab record with missing last two fields copy: dest: /etc/fstab - content: '//nas/photo /home/jik/pictures cifs defaults,credentials=/etc/security/nas.creds,uid=jik,gid=users,forceuid,forcegid,noserverino,netdev + content: '//nas/photo /home/jik/pictures cifs defaults,credentials=/etc/security/nas.creds,uid=jik,gid=users,forceuid,forcegid,noserverino,_netdev ' @@ -244,8 +244,9 @@ - 1 == optional_fields_content.stdout_lines | length - name: Create empty file - command: dd if=/dev/zero of=/tmp/myfs.img bs=1048576 count=20 - when: ansible_system in ('Linux') + community.general.filesize: + path: /tmp/myfs.img + size: 20M - name: Format FS community.general.filesystem: @@ -331,8 +332,9 @@ - name: Block to test boot option for Linux block: - name: Create empty file - command: dd if=/dev/zero of=/tmp/myfs.img bs=1048576 count=20 - when: ansible_system in ('Linux') + community.general.filesize: + path: /tmp/myfs.img + size: 20M - name: Format FS community.general.filesystem: @@ -371,8 +373,9 @@ - name: Block to test missing newline at the EOF of fstab block: - name: Create empty file - command: dd if=/dev/zero of=/tmp/myfs1.img bs=1048576 count=20 - when: ansible_system in ('Linux') + community.general.filesize: + path: /tmp/myfs1.img + size: 20M - name: Format FS community.general.filesystem: fstype: ext3 diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index 701f4ba..cd3014c 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -18,6 +18,5 @@ stage="${S:-prod}" provider="${P:-default}" # shellcheck disable=SC2086 -ansible-galaxy collection install -f community.general:4.8.1 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ --remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}" diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 14f2e57..c622560 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -74,7 +74,11 @@ else fi # START: HACK install dependencies -retry ansible-galaxy collection install community.general + +if [ "${ansible_version}" == "2.9" ] || [ "${ansible_version}" == "2.10" ]; then + COMMUNITY_GENERAL_OPTION="-b 4.8.1" +fi +retry git clone --depth=1 --single-branch ${COMMUNITY_GENERAL_OPTION:-} https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/general" # END: HACK export PYTHONIOENCODING='utf-8'