From 5907acf7093ed3c64b418590287db8446f9bac21 Mon Sep 17 00:00:00 2001 From: Jan Benedikt Date: Fri, 25 Oct 2019 03:35:51 -0400 Subject: Chaging name of rhel resource directory to rpm Changing name of rhel resource directory in "resources/pkg" from rhel to rpm due to platfrom independent repository for all distributions supporting RPM packages. Issue-ID: OOM-2150 Change-Id: Ie5425df8b8550c618440586b495907f86c4cc509 Signed-off-by: Jan Benedikt --- ansible/roles/nginx/defaults/main.yml | 2 +- ansible/roles/package-repository/defaults/main.yml | 2 +- .../molecule/default/tests/test_infrastructure-server.py | 2 +- .../molecule/default/tests/test_kubernetes-node-1.py | 2 +- ansible/test/roles/prepare-package-repository/tasks/main.yml | 10 +++++----- ansible/test/roles/prepare-package-repository/vars/main.yml | 2 +- build/create_repo.sh | 6 +++--- build/docker-entrypoint.sh | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ansible/roles/nginx/defaults/main.yml b/ansible/roles/nginx/defaults/main.yml index 8bf44197..c2f1e05c 100644 --- a/ansible/roles/nginx/defaults/main.yml +++ b/ansible/roles/nginx/defaults/main.yml @@ -16,7 +16,7 @@ nginx: - "{{ app_data_path }}/certs:/etc/nginx/certs:ro" - "{{ app_data_path }}/git-repo:/srv/git:rw" - "{{ app_data_path }}/http:/srv/http:rw" - - "{{ app_data_path }}/pkg/rhel:/srv/http/repo.infra-server/rhel:rw" + - "{{ app_data_path }}/pkg/rpm:/srv/http/repo.infra-server/rpm:rw" - "{{ app_data_path }}/pkg/ubuntu/xenial:/srv/http/repo.infra-server/ubuntu/xenial:rw" - /var/log/nginx:/var/log/nginx:rw # Default rule for tarball naming translation diff --git a/ansible/roles/package-repository/defaults/main.yml b/ansible/roles/package-repository/defaults/main.yml index 678b6bd4..0557eda3 100644 --- a/ansible/roles/package-repository/defaults/main.yml +++ b/ansible/roles/package-repository/defaults/main.yml @@ -3,6 +3,6 @@ package_repositories: - name: "{{ app_name }}" file: "{{ app_name | lower }}" description: "{{ app_name | upper }} offline repository" - baseurl: "{{ 'http://repo.infra-server/rhel' if 'infrastructure' not in group_names else 'file://' + app_data_path + '/pkg/rhel' }}" + baseurl: "{{ 'http://repo.infra-server/rpm' if 'infrastructure' not in group_names else 'file://' + app_data_path + '/pkg/rpm' }}" gpgcheck: false enabled: true diff --git a/ansible/roles/package-repository/molecule/default/tests/test_infrastructure-server.py b/ansible/roles/package-repository/molecule/default/tests/test_infrastructure-server.py index 63588e26..9fb1a4f9 100644 --- a/ansible/roles/package-repository/molecule/default/tests/test_infrastructure-server.py +++ b/ansible/roles/package-repository/molecule/default/tests/test_infrastructure-server.py @@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def test_onap_repo(host): fc = host.file('/etc/yum.repos.d/moleculetestapp.repo').content_string expected_content = """[moleculetestapp] -baseurl = file:///opt/moleculetestapp/pkg/rhel +baseurl = file:///opt/moleculetestapp/pkg/rpm enabled = 1 gpgcheck = 0 name = MOLECULETESTAPP offline repository""" diff --git a/ansible/roles/package-repository/molecule/default/tests/test_kubernetes-node-1.py b/ansible/roles/package-repository/molecule/default/tests/test_kubernetes-node-1.py index eab7d065..fda85e8d 100644 --- a/ansible/roles/package-repository/molecule/default/tests/test_kubernetes-node-1.py +++ b/ansible/roles/package-repository/molecule/default/tests/test_kubernetes-node-1.py @@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def test_onap_repo(host): fc = host.file('/etc/yum.repos.d/moleculetestapp.repo').content_string expected_content = """[moleculetestapp] -baseurl = http://repo.infra-server/rhel +baseurl = http://repo.infra-server/rpm enabled = 1 gpgcheck = 0 name = MOLECULETESTAPP offline repository""" diff --git a/ansible/test/roles/prepare-package-repository/tasks/main.yml b/ansible/test/roles/prepare-package-repository/tasks/main.yml index 66f81d6d..983e9766 100644 --- a/ansible/test/roles/prepare-package-repository/tasks/main.yml +++ b/ansible/test/roles/prepare-package-repository/tasks/main.yml @@ -12,15 +12,15 @@ name: createrepo state: present -- name: "Ensure {{ rhel_pkg_dir }} exists" +- name: "Ensure {{ pkg_dir }} exists" file: - path: "{{ rhel_pkg_dir }}" + path: "{{ pkg_dir }}" state: directory - name: Download rpm packages - command: "yumdownloader --destdir={{ rhel_pkg_dir }} --resolve {{ packages | join(' ') }}" + command: "yumdownloader --destdir={{ pkg_dir }} --resolve {{ packages | join(' ') }}" - name: Index repository - command: "createrepo {{ rhel_pkg_dir }}" + command: "createrepo {{ pkg_dir }}" args: - creates: "{{ rhel_pkg_dir }}/repodata" + creates: "{{ pkg_dir }}/repodata" diff --git a/ansible/test/roles/prepare-package-repository/vars/main.yml b/ansible/test/roles/prepare-package-repository/vars/main.yml index 80944284..195ad0f1 100644 --- a/ansible/test/roles/prepare-package-repository/vars/main.yml +++ b/ansible/test/roles/prepare-package-repository/vars/main.yml @@ -1,5 +1,5 @@ --- -rhel_pkg_dir: "{{ app_data_path }}/pkg/rhel" +pkg_dir: "{{ app_data_path }}/pkg/rpm" packages: - "docker-ce-18.09.5" - container-selinux diff --git a/build/create_repo.sh b/build/create_repo.sh index b6db6ad2..eaf0ee30 100755 --- a/build/create_repo.sh +++ b/build/create_repo.sh @@ -12,7 +12,7 @@ container_repo_volume="/mnt/repo/" # Docker image name and version docker_image="centos:centos7.6.1810" # Expected directory for RPM packages -expected_dir="resources/pkg/rhel" +expected_dir="resources/pkg/rpm" help () { echo "Script for run docker container with RPM repository" @@ -56,10 +56,10 @@ do shift;shift done -# Check if path contains expected path "resources/pkg/rhel" +# Check if path contains expected path "resources/pkg/rpm" if ! [[ "/$volume_repo_directory/" = *"/$expected_dir/"* ]]; then # Create repo folder if it not exists - volume_repo_directory="$volume_repo_directory"/resources/pkg/rhel + volume_repo_directory="$volume_repo_directory"/resources/pkg/rpm [ ! -d "$volume_repo_directory" ] && mkdir -p $volume_repo_directory fi diff --git a/build/docker-entrypoint.sh b/build/docker-entrypoint.sh index 1b4ec53c..14f6aaa7 100755 --- a/build/docker-entrypoint.sh +++ b/build/docker-entrypoint.sh @@ -14,7 +14,7 @@ help () { echo -e "-l --list: set path where rpm list is stored in container\n" echo "Both paths have to be set with shared volume between" echo "container and host computer. Default path in container is: /tmp/" - echo "Repository will be created at: //resources/pkg/rhel/" + echo "Repository will be created at: //resources/pkg/rpm/" echo "RMP list is stored at: ./data_list/" } @@ -52,7 +52,7 @@ do done # Testing if directory parametter was used -# If not variable is sets to default value /tmp/repo/resources/pkg/rhel +# If not variable is sets to default value /tmp/repo/resources/pkg/rpm if test -z "$OFFLINE_REPO_DIR" then OFFLINE_REPO_DIR="/tmp/repo/" -- cgit 1.2.3-korg