Skip to content
This repository has been archived by the owner on Feb 28, 2023. It is now read-only.

Commit

Permalink
Update versions + disable signature/checksum check
Browse files Browse the repository at this point in the history
  • Loading branch information
JGoutin committed Mar 13, 2020
1 parent d3057eb commit 8777c18
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ language: python
services: docker

install:
- pip install molecule[docker] --pre
- pip install molecule[docker] testinfra yamllint ansible-lint

script:
- molecule test
Expand Down
6 changes: 5 additions & 1 deletion filter_plugins/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

# Packages from Xilinx website
_PACKAGES = {
'2019.2': 'xrt_201920.2.3.1301',
'2020.1': 'xrt_202010.2.5.227',
'2019.2': 'xrt_201920.2.5.309',
'2019.1': 'xrt_201910.2.2.2250',
'2018.3': 'xrt_201830.2.1.1794',
'2018.2': 'xrt_201802.2.1.127'
Expand Down Expand Up @@ -66,6 +67,9 @@ def _pkg_info(version, name, env, ansible_facts):
'7.4.1708' if is_rhel7 else
# Ubuntu packages use distribution version (ex: "18.04")
ansible_facts['distribution_version'])
if version >= "2019.2":
# Architecture information
dist += '-x86_64' if family == 'RedHat' else '-amd64'

# Define the package file name
package = ''.join((
Expand Down
20 changes: 14 additions & 6 deletions molecule/default/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,17 @@ FROM {{ item.registry.url }}/{{ item.image }}
FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \
elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi
{% if item.env is defined %}
{% for var, value in item.env.items() %}
{% if value %}
ENV {{ var }} {{ value }}
{% endif %}
{% endfor %}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates iproute2 python3-apt aptitude && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install /usr/bin/python3 /usr/bin/python3-config /usr/bin/dnf-3 sudo bash iproute && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y /usr/bin/python /usr/bin/python2-config sudo yum-plugin-ovl bash iproute && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python3 sudo bash iproute2 && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python3 sudo bash ca-certificates; \
elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python3 sudo bash ca-certificates iproute2 && xbps-remove -O; fi
File renamed without changes.
60 changes: 35 additions & 25 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,85 +6,97 @@ dependency:
driver:
name: docker

lint:
name: yamllint

platforms:
- name: ubuntu_bionic-2020.1
image: ubuntu:bionic
groups:
- xrt_2020_1

- name: ubuntu_bionic-2019.2
image: ubuntu:bionic
groups:
- xrt_2019.1
- xrt_2019_2

- name: ubuntu_bionic-2019.1
image: ubuntu:bionic
groups:
- xrt_2019.1
- xrt_2019_1

- name: ubuntu_bionic-2018.3
image: ubuntu:bionic
groups:
- xrt_2018.3
- xrt_2018_3

- name: ubuntu_bionic-2018.3-aws
image: ubuntu:bionic
groups:
# Warning:
# The "aws" package is not provided for all XRT versions by Xilinx
- xrt_2018.3
- xrt_2018_3
- aws

- name: ubuntu_bionic-2018.2
image: ubuntu:bionic
groups:
- xrt_2018.2
- xrt_2018_2

- name: ubuntu_xenial-2020.1
image: ubuntu:xenial
groups:
- xrt_2020_1

- name: ubuntu_xenial-2019.2
image: ubuntu:xenial
groups:
- xrt_2019.2
- xrt_2019_2

- name: ubuntu_xenial-2019.1
image: ubuntu:xenial
groups:
- xrt_2019.1
- xrt_2019_1

- name: ubuntu_xenial-2018.3
image: ubuntu:xenial
groups:
- xrt_2018.3
- xrt_2018_3

- name: ubuntu_xenial-2018.2
image: ubuntu:xenial
groups:
- xrt_2018.2
- xrt_2018_2

- name: centos_7-2020.1
image: centos:7
groups:
- xrt_2020_1

- name: centos_7-2019.2
image: centos:7
groups:
- xrt_2019.2
- xrt_2019_2

- name: centos_7-2019.1
image: centos:7
groups:
- xrt_2019.1
- xrt_2019_1

- name: centos_7-2018.3
image: centos:7
groups:
- xrt_2018.3
- xrt_2018_3

- name: centos_7-2018.2
image: centos:7
groups:
- xrt_2018.2
- xrt_2018_2

- name: centos_7-aws
image: centos:7
groups:
- aws
# Disabled in Travis-CI:
# Download is only authorized from an AWS EC2 instance
# - no_xrt
- no_xrt

- name: centos_7-aws_fpga_src
image: centos:7
Expand All @@ -94,17 +106,17 @@ platforms:

provisioner:
name: ansible
lint:
name: ansible-lint
inventory:
group_vars:
xrt_2019.2:
xrt_2020_1:
xilinx_xrt_version: 2020.1
xrt_2019_2:
xilinx_xrt_version: 2019.2
xrt_2019.1:
xrt_2019_1:
xilinx_xrt_version: 2019.1
xrt_2018.3:
xrt_2018_3:
xilinx_xrt_version: 2018.3
xrt_2018.2:
xrt_2018_2:
xilinx_xrt_version: 2018.2
no_xrt:
xilinx_xrt_install: false
Expand All @@ -116,5 +128,3 @@ provisioner:

verifier:
name: testinfra
lint:
name: flake8
2 changes: 2 additions & 0 deletions tasks/aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
failed_when: false # May be not available
register: aws_package_sig
when:
- false # Disabled, fails on all packages since 2019.2
- xilinx_xrt_install | bool
- not xbutil.stat.exists

Expand All @@ -41,6 +42,7 @@
failed_when: false # May be not available
register: aws_package_digests
when:
- false # Disabled, fails on all packages since 2019.2
- xilinx_xrt_install | bool
- not xbutil.stat.exists

Expand Down
2 changes: 2 additions & 0 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
failed_when: false # May be not available
register: xrt_package_sig
when:
- false # Disabled, fails on all packages since 2019.2
- xilinx_xrt_install | bool
- not xbutil.stat.exists

Expand Down Expand Up @@ -86,6 +87,7 @@
failed_when: false # May be not available
register: xrt_package_digests
when:
- false # Disabled, fails on all packages since 2019.2
- xilinx_xrt_install | bool
- not xbutil.stat.exists

Expand Down

0 comments on commit 8777c18

Please sign in to comment.