From a2ee952c5889f12d8afd075358f3bd1177ed13e9 Mon Sep 17 00:00:00 2001 From: aburston Date: Thu, 18 Aug 2022 14:30:07 +0000 Subject: [PATCH] updated version number + removed pacakging code --- BUILD.md | 15 ---- README.md | 30 ++------ VERSION.txt | 2 +- build_container.sh | 2 +- ...ble_cli_21.7 => nita-cmd_ansible_cli_22.8} | 4 +- ....7_help => nita-cmd_ansible_cli_22.8_help} | 4 +- packaging/.gitignore | 3 - packaging/build-ansible-21.7-1.sh | 68 ----------------- .../nita-ansible-2.9.18-21.7-1/DEBIAN/control | 9 --- .../DEBIAN/postinst | 3 - .../nita-ansible-2.9.18-21.7-1/DEBIAN/prerm | 3 - .../etc/nita-ansible-21.7/install.sh | 53 ------------- .../etc/nita-ansible-21.7/remove.sh | 38 ---------- packaging_redhat/.rpmmacros | 3 - packaging_redhat/build-ansible-21.7-1.sh | 76 ------------------- .../BUILD/.gitignore | 2 - .../BUILDROOT/.gitignore | 2 - .../RPMS/.gitignore | 2 - .../SOURCES/.gitignore | 3 - .../etc/nita-ansible-21.7/install.sh | 53 ------------- .../etc/nita-ansible-21.7/remove.sh | 38 ---------- .../SPECS/nita-ansible-2.9.18.spec | 70 ----------------- .../SRPMS/.gitignore | 2 - .../nita-ansible-2.9.18-21.7-1/TMP/.gitignore | 2 - 24 files changed, 11 insertions(+), 476 deletions(-) rename cli_scripts/{nita-cmd_ansible_cli_21.7 => nita-cmd_ansible_cli_22.8} (92%) rename cli_scripts/{nita-cmd_ansible_cli_21.7_help => nita-cmd_ansible_cli_22.8_help} (88%) delete mode 100644 packaging/.gitignore delete mode 100755 packaging/build-ansible-21.7-1.sh delete mode 100755 packaging/nita-ansible-2.9.18-21.7-1/DEBIAN/control delete mode 100755 packaging/nita-ansible-2.9.18-21.7-1/DEBIAN/postinst delete mode 100755 packaging/nita-ansible-2.9.18-21.7-1/DEBIAN/prerm delete mode 100755 packaging/nita-ansible-2.9.18-21.7-1/etc/nita-ansible-21.7/install.sh delete mode 100755 packaging/nita-ansible-2.9.18-21.7-1/etc/nita-ansible-21.7/remove.sh delete mode 100644 packaging_redhat/.rpmmacros delete mode 100755 packaging_redhat/build-ansible-21.7-1.sh delete mode 100644 packaging_redhat/nita-ansible-2.9.18-21.7-1/BUILD/.gitignore delete mode 100644 packaging_redhat/nita-ansible-2.9.18-21.7-1/BUILDROOT/.gitignore delete mode 100644 packaging_redhat/nita-ansible-2.9.18-21.7-1/RPMS/.gitignore delete mode 100644 packaging_redhat/nita-ansible-2.9.18-21.7-1/SOURCES/.gitignore delete mode 100755 packaging_redhat/nita-ansible-2.9.18-21.7-1/SOURCES/nita-ansible-2.9.18-21.7/etc/nita-ansible-21.7/install.sh delete mode 100755 packaging_redhat/nita-ansible-2.9.18-21.7-1/SOURCES/nita-ansible-2.9.18-21.7/etc/nita-ansible-21.7/remove.sh delete mode 100644 packaging_redhat/nita-ansible-2.9.18-21.7-1/SPECS/nita-ansible-2.9.18.spec delete mode 100644 packaging_redhat/nita-ansible-2.9.18-21.7-1/SRPMS/.gitignore delete mode 100644 packaging_redhat/nita-ansible-2.9.18-21.7-1/TMP/.gitignore diff --git a/BUILD.md b/BUILD.md index ae1bc08..9aaacd5 100644 --- a/BUILD.md +++ b/BUILD.md @@ -5,21 +5,6 @@ git clone # Package Build -## Debian/Ubuntu Package - -To generate a .deb package file for the instalation of the NITA Ansible on a Debian based system you can run the *build-ansible-21.7-1.sh* script file found under the *packaging* folder: -```bash -cd packaging -./build-ansible-21.7-1.sh -``` - -## Centos/RedHat Package -To generate a .rpm package file for the instalation of the NITA Ansible on a Centos based system you can run the *build-ansible-21.7-1.sh* script file found under the *packaging_redhat* folder: -```bash -cd packaging_redhat -./build-ansible-21.7-1.sh -``` - # Docker Image Build To build the ansible docker image you can simply run the *build_container.sh* also found on the root folder of this repo: ```bash diff --git a/README.md b/README.md index b038a65..dc0ba70 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# NITA Ansible 21.7 +# NITA Ansible 22.8 -Welcome to NITA 21.7. +Welcome to NITA 22.8. -Packages built from this branch will be nita-*-21.7-x where x is the packaging release. +Packages built from this branch will be nita-*-22.8-x where x is the packaging release. This branch also contains patches from other branches or minor modifications as required to support the stability and usability of the release. There are also some backwards compatibility packages here for ansible and robot that allow projects written for NITA 3.0.7 to work without having to make any changes. -Note that NITA 21.7 is backward compatible with NITA 20.10 projects, provided the correct ansible and robot containers are installed. +Note that NITA 22.8 is backward compatible with NITA 21.7 projects, provided the correct ansible and robot containers are installed. # Copyright @@ -41,26 +41,6 @@ NITA depends on docker-ce and docker-compose. * It is recommended to follow this steps after installing docker-ce: https://docs.docker.com/engine/install/linux-postinstall/ * To install **docker-compose** follow the instructions found here: https://docs.docker.com/compose/install/ -## Installation - -If you do not have the the required package files for your system, .deb for Ubuntu or .rpm for Centos refer to [BUILD.md](./BUILD.md) file for instructions on how to generate them. - -### Ubuntu - -If you have been provided with the .deb package file, then follow the instructions provided in the [Dependencies](##Dependencies) section above and then run the following command: - -```bash -sudo apt-get install ./nita-ansible-2.9.18-21.7-1.deb -``` - -### Centos - -If you have been provided with the .rpm package file, then follow the instructions provided in the [Dependencies](##Dependencies) section above and then run the following command: - - -```bash -sudo yum install ./nita-ansible-2.9.18-21.7-1.noarch.rpm -``` # Using nita-ansible This container holds Ansible executables, related libraries, and files for managing Juniper devices using Ansible. The NITA framework uses the nita-ansible container to run ansible playbooks included with the framework. Nita-ansible can also be used as a standalone container for executing your own playbooks. Simply put your inventory file and playbooks into a project folder on the system hosting the container. You will also want to put a bash script to execute the ```ansible-playbook``` command. @@ -279,4 +259,4 @@ More complex examples of project folders can be found in the larger NITA project # Misc -For more information on NITA releases refer to the [README.md](https://github.com/Juniper/nita-webapp/blob/21.7/README.md) for the NITA Webapp. +For more information on NITA releases refer to the [README.md](https://github.com/Juniper/nita-webapp/blob/22.8/README.md) for the NITA Webapp. diff --git a/VERSION.txt b/VERSION.txt index 411543d..8dc248c 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -21.7 +22.8 diff --git a/build_container.sh b/build_container.sh index eff6632..a6cc922 100755 --- a/build_container.sh +++ b/build_container.sh @@ -13,4 +13,4 @@ # # ******************************************************** -docker build -t juniper/nita-ansible:21.7-1 . +docker build -t juniper/nita-ansible:22.8-1 . diff --git a/cli_scripts/nita-cmd_ansible_cli_21.7 b/cli_scripts/nita-cmd_ansible_cli_22.8 similarity index 92% rename from cli_scripts/nita-cmd_ansible_cli_21.7 rename to cli_scripts/nita-cmd_ansible_cli_22.8 index 2d92248..a5ec5bf 100644 --- a/cli_scripts/nita-cmd_ansible_cli_21.7 +++ b/cli_scripts/nita-cmd_ansible_cli_22.8 @@ -14,7 +14,7 @@ # ******************************************************** if [ "$_CLI_RUNNER_DEBUG" == 1 ]; then echo `cat <&2 fi -docker run -e PS1="\u@\h:\w# " -it --rm --name ansible -u root -v /var/nita_project:/project:rw -v /var/nita_configs:/var/tmp/build:rw juniper/nita-ansible:21.7-1 /bin/bash +docker run -e PS1="\u@\h:\w# " -it --rm --name ansible -u root -v /var/nita_project:/project:rw -v /var/nita_configs:/var/tmp/build:rw juniper/nita-ansible:22.8-1 /bin/bash diff --git a/cli_scripts/nita-cmd_ansible_cli_21.7_help b/cli_scripts/nita-cmd_ansible_cli_22.8_help similarity index 88% rename from cli_scripts/nita-cmd_ansible_cli_21.7_help rename to cli_scripts/nita-cmd_ansible_cli_22.8_help index 89aacfb..1d56d65 100644 --- a/cli_scripts/nita-cmd_ansible_cli_21.7_help +++ b/cli_scripts/nita-cmd_ansible_cli_22.8_help @@ -12,7 +12,7 @@ # Third-Party Code: This code may depend on other components under separate copyright notice and license terms. Your use of the source code for those components is subject to the terms and conditions of the respective license as noted in the Third-Party source code file. # # ******************************************************** - echo -n " nita-cmd ansible cli 21.7 => " + echo -n " nita-cmd ansible cli 22.8 => " echo `cat <&2 diff --git a/packaging/.gitignore b/packaging/.gitignore deleted file mode 100644 index 2fb5973..0000000 --- a/packaging/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -nita-*/usr/share/nita-ansible*/images/*.tar.gz -nita-*/usr/local/bin/* -*.deb \ No newline at end of file diff --git a/packaging/build-ansible-21.7-1.sh b/packaging/build-ansible-21.7-1.sh deleted file mode 100755 index 8949bbf..0000000 --- a/packaging/build-ansible-21.7-1.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -# ******************************************************** -# -# Project: nita-ansible -# -# Copyright (c) Juniper Networks, Inc., 2021. All rights reserved. -# -# Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html -# -# SPDX-License-Identifier: Apache-2.0 -# -# Third-Party Code: This code may depend on other components under separate copyright notice and license terms. Your use of the source code for those components is subject to the terms and conditions of the respective license as noted in the Third-Party source code file. -# -# ******************************************************** - -# stop the script if a command fails -set -e - -PACKAGE=nita-ansible-2.9.18 -VERSION=21.7-1 - -# cleanup version if the directory name is used -VTMP="${VERSION#$PACKAGE-}" -VERSION=${VTMP%/} - - -if [[ "x$VERSION" == "x" ]]; then - echo "Must provide package version" - exit 1 -fi - -if [ ! -d ${PACKAGE}-${VERSION} ]; then - echo "Directory ${PACKAGE}-${VERSION} does not exist" -fi - -# installing docker-ce on host -if dpkg-query -s docker-ce >/dev/null 2>&1; then - echo "docker-ce already installed" -else - apt-get -y update - apt-get -y install apt-transport-https ca-certificates curl \ - software-properties-common - curl -fsSL https://download.docker.com/linux/ubuntu/gpg |apt-key add - - apt-key fingerprint 0EBFCD88 - add-apt-repository \ - "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ - $(lsb_release -cs) stable" - apt-get -y update - apt-get -y install docker-ce -fi - -# copy cli scripts -SCRIPTSDIR=${PACKAGE}-${VERSION}/usr/local/bin -mkdir -p ${SCRIPTSDIR} -install -m 755 ../cli_scripts/* ${SCRIPTSDIR} - -# pull all the required containers -IMAGEDIR=${PACKAGE}-${VERSION}/usr/share/${PACKAGE}/images -mkdir -p ${IMAGEDIR} - -( - cd .. - ./build_container.sh -) -docker save juniper/nita-ansible:21.7-1 | gzip > ${IMAGEDIR}/nita-ansible-21.7-1.tar.gz - -dpkg-deb --build ${PACKAGE}-${VERSION} diff --git a/packaging/nita-ansible-2.9.18-21.7-1/DEBIAN/control b/packaging/nita-ansible-2.9.18-21.7-1/DEBIAN/control deleted file mode 100755 index 2482dfd..0000000 --- a/packaging/nita-ansible-2.9.18-21.7-1/DEBIAN/control +++ /dev/null @@ -1,9 +0,0 @@ -Package: nita-ansible-2.9.18 -Version: 21.7-1 -Section: base -Priority: optional -Architecture: all -Maintainer: Ashley Burston , Hugo Ribeiro -Description: Ansible addon for NITA base package - Copyright Juniper Networks 2020 - Apache License, Version 2.0, http://www.apache.org/licenses/LICENSE-2.0 diff --git a/packaging/nita-ansible-2.9.18-21.7-1/DEBIAN/postinst b/packaging/nita-ansible-2.9.18-21.7-1/DEBIAN/postinst deleted file mode 100755 index 4560928..0000000 --- a/packaging/nita-ansible-2.9.18-21.7-1/DEBIAN/postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -bash /etc/nita-ansible-21.7/install.sh diff --git a/packaging/nita-ansible-2.9.18-21.7-1/DEBIAN/prerm b/packaging/nita-ansible-2.9.18-21.7-1/DEBIAN/prerm deleted file mode 100755 index 48f9d74..0000000 --- a/packaging/nita-ansible-2.9.18-21.7-1/DEBIAN/prerm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -bash /etc/nita-ansible-21.7/remove.sh diff --git a/packaging/nita-ansible-2.9.18-21.7-1/etc/nita-ansible-21.7/install.sh b/packaging/nita-ansible-2.9.18-21.7-1/etc/nita-ansible-21.7/install.sh deleted file mode 100755 index 646f05b..0000000 --- a/packaging/nita-ansible-2.9.18-21.7-1/etc/nita-ansible-21.7/install.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -# ******************************************************** -# -# Project: nita-ansible -# -# Copyright (c) Juniper Networks, Inc., 2021. All rights reserved. -# -# Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html -# -# SPDX-License-Identifier: Apache-2.0 -# -# Third-Party Code: This code may depend on other components under separate copyright notice and license terms. Your use of the source code for those components is subject to the terms and conditions of the respective license as noted in the Third-Party source code file. -# -# ******************************************************** - -PACKAGE=nita-ansible-2.9.18 -VERSION=21.7-1 -IMAGES_DIR=/usr/share/${PACKAGE}/images - -# stop the script if a command fails -set -e - -# function to add docker images -function add_image { - - SRC="$1" - TAG="$2" - - echo "Adding docker image $2" - - # load the image - RESPONSE=`docker load -q < ${SRC}` - echo $RESPONSE - ID=`echo ${RESPONSE} | awk -F: '{ print \$3 }'` - - if [[ "x$ID" == "x" ]]; then - echo "Failed to load image $SRC" - exit 1 - fi - - # tag the image if it isn't already tagged in the tar.gz file - # older versions of docker-ce have this issue - if [[ `docker images | awk '{print $1":"$2}' | grep -c "$TAG"` == 0 ]]; then - docker tag "$ID" "$TAG" - fi - - docker tag "$TAG" "${TAG%:*}:_nita_release_$VERSION" - -} - -# load docker images -add_image $IMAGES_DIR/nita-ansible-21.7-1.tar.gz juniper/nita-ansible:21.7-1 diff --git a/packaging/nita-ansible-2.9.18-21.7-1/etc/nita-ansible-21.7/remove.sh b/packaging/nita-ansible-2.9.18-21.7-1/etc/nita-ansible-21.7/remove.sh deleted file mode 100755 index e569cc7..0000000 --- a/packaging/nita-ansible-2.9.18-21.7-1/etc/nita-ansible-21.7/remove.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# ******************************************************** -# -# Project: nita-ansible -# -# Copyright (c) Juniper Networks, Inc., 2021. All rights reserved. -# -# Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html -# -# SPDX-License-Identifier: Apache-2.0 -# -# Third-Party Code: This code may depend on other components under separate copyright notice and license terms. Your use of the source code for those components is subject to the terms and conditions of the respective license as noted in the Third-Party source code file. -# -# ******************************************************** - -PACKAGE=nita-ansible-2.9.18 -VERSION=21.7-1 - -# stop the script if a command fails -#set -e -#set -x - -# wait 15 seconds for the containers to exit -sleep 15 - -# remove exited containers: -docker ps --filter status=dead --filter status=exited -aq | xargs -r docker rm -v - -# remove unused volumes: -docker volume ls -qf dangling=true | xargs -r docker volume rm - -# remove docker images -docker rmi -f juniper/nita-ansible:21.7-1 -docker rmi -f juniper/nita-ansible:_nita_release_$VERSION - -# remove unused images -docker images --no-trunc | grep '' | awk '{ print $3 }' | xargs -r docker rmi diff --git a/packaging_redhat/.rpmmacros b/packaging_redhat/.rpmmacros deleted file mode 100644 index df63b0b..0000000 --- a/packaging_redhat/.rpmmacros +++ /dev/null @@ -1,3 +0,0 @@ -%_topdir %(echo $RPM_BUILD_DIR) - -%_tmppath %{_topdir}/TMP \ No newline at end of file diff --git a/packaging_redhat/build-ansible-21.7-1.sh b/packaging_redhat/build-ansible-21.7-1.sh deleted file mode 100755 index 3cc5f78..0000000 --- a/packaging_redhat/build-ansible-21.7-1.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash - -# ******************************************************** -# -# Project: nita-ansible -# -# Copyright (c) Juniper Networks, Inc., 2021. All rights reserved. -# -# Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html -# -# SPDX-License-Identifier: Apache-2.0 -# -# Third-Party Code: This code may depend on other components under separate copyright notice and license terms. Your use of the source code for those components is subject to the terms and conditions of the respective license as noted in the Third-Party source code file. -# -# ******************************************************** - -# stop the script if a command fails -set -e - -PACKAGE=nita-ansible-2.9.18 -VERSION=21.7 -RELEASE=1 - -# cleanup version if the directory name is used -VTMP="${VERSION#$PACKAGE-}" -VERSION=${VTMP%/} - - -if [[ "x$VERSION" == "x" ]]; then - echo "Must provide package version" - exit 1 -fi - -if [ ! -d ${PACKAGE}-${VERSION}-${RELEASE} ]; then - echo "Directory ${PACKAGE}-${VERSION}-${RELEASE} does not exist" -fi - -# installing docker-ce on host -if (yum list installed | grep docker-ce) >/dev/null 2>&1; then - echo "docker-ce already installed" -else - yum install -y yum-utils rpm-build - yum-config-manager \ - --add-repo \ - https://download.docker.com/linux/centos/docker-ce.repo - yum update -y - yum install -y docker-ce - systemctl start docker -fi - -SOURCE_DIR=${PACKAGE}-${VERSION}-${RELEASE}/SOURCES - -# copy cli scripts -SCRIPTSDIR=${SOURCE_DIR}/${PACKAGE}-${VERSION}/usr/local/bin -mkdir -p ${SCRIPTSDIR} -install -m 755 ../cli_scripts/* ${SCRIPTSDIR} - -# pull all the required containers -IMAGEDIR=${SOURCE_DIR}/${PACKAGE}-${VERSION}/usr/share/${PACKAGE}/images -mkdir -p ${IMAGEDIR} -( - cd .. - ./build_container.sh -) -docker save juniper/nita-ansible:21.7-1 | gzip > ${IMAGEDIR}/nita-ansible-${VERSION}-${RELEASE}.tar.gz - -# Create a tarball of with source -( - cd ${SOURCE_DIR} - tar czf ${PACKAGE}-${VERSION}.tar.gz ${PACKAGE}-${VERSION} -) - -# Build rpm file -export RPM_BUILD_DIR="${PWD}/${PACKAGE}-${VERSION}-${RELEASE}" -cp .rpmmacros ~ -rpmbuild -ba ${PACKAGE}-${VERSION}-${RELEASE}/SPECS/${PACKAGE}.spec diff --git a/packaging_redhat/nita-ansible-2.9.18-21.7-1/BUILD/.gitignore b/packaging_redhat/nita-ansible-2.9.18-21.7-1/BUILD/.gitignore deleted file mode 100644 index c96a04f..0000000 --- a/packaging_redhat/nita-ansible-2.9.18-21.7-1/BUILD/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/packaging_redhat/nita-ansible-2.9.18-21.7-1/BUILDROOT/.gitignore b/packaging_redhat/nita-ansible-2.9.18-21.7-1/BUILDROOT/.gitignore deleted file mode 100644 index c96a04f..0000000 --- a/packaging_redhat/nita-ansible-2.9.18-21.7-1/BUILDROOT/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/packaging_redhat/nita-ansible-2.9.18-21.7-1/RPMS/.gitignore b/packaging_redhat/nita-ansible-2.9.18-21.7-1/RPMS/.gitignore deleted file mode 100644 index c96a04f..0000000 --- a/packaging_redhat/nita-ansible-2.9.18-21.7-1/RPMS/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/packaging_redhat/nita-ansible-2.9.18-21.7-1/SOURCES/.gitignore b/packaging_redhat/nita-ansible-2.9.18-21.7-1/SOURCES/.gitignore deleted file mode 100644 index 287f298..0000000 --- a/packaging_redhat/nita-ansible-2.9.18-21.7-1/SOURCES/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -!.gitignore -*.tar.gz -nita-*/usr/local/bin/* \ No newline at end of file diff --git a/packaging_redhat/nita-ansible-2.9.18-21.7-1/SOURCES/nita-ansible-2.9.18-21.7/etc/nita-ansible-21.7/install.sh b/packaging_redhat/nita-ansible-2.9.18-21.7-1/SOURCES/nita-ansible-2.9.18-21.7/etc/nita-ansible-21.7/install.sh deleted file mode 100755 index c567b0d..0000000 --- a/packaging_redhat/nita-ansible-2.9.18-21.7-1/SOURCES/nita-ansible-2.9.18-21.7/etc/nita-ansible-21.7/install.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -# ******************************************************** -# -# Project: nita-ansible -# -# Copyright (c) Juniper Networks, Inc., 2021. All rights reserved. -# -# Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html -# -# SPDX-License-Identifier: Apache-2.0 -# -# Third-Party Code: This code may depend on other components under separate copyright notice and license terms. Your use of the source code for those components is subject to the terms and conditions of the respective license as noted in the Third-Party source code file. -# -# ******************************************************** - -PACKAGE=nita-ansible-2.9.18 -VERSION=21.7-1 -IMAGES_DIR=/usr/share/${PACKAGE}/images - -# stop the script if a command fails -set -e - -# function to add docker images -function add_image { - - SRC="$1" - TAG="$2" - - echo "Adding docker image $2" - - # load the image - RESPONSE=`docker load -q < ${SRC}` - echo $RESPONSE - ID=`echo ${RESPONSE} | awk -F: '{ print \$3 }'` - - if [[ "x$ID" == "x" ]]; then - echo "Failed to load image $SRC" - exit 1 - fi - - # tag the image if it isn't already tagged in the tar.gz file - # older versions of docker-ce have this issue - if [[ `docker images | awk '{print $1":"$2}' | grep -c "$TAG"` == 0 ]]; then - docker tag "$ID" "$TAG" - fi - - docker tag "$TAG" "${TAG%:*}:_nita_release_$VERSION" - -} - -# load docker images -add_image $IMAGES_DIR/nita-ansible-${VERSION}.tar.gz juniper/nita-ansible:21.7-1 diff --git a/packaging_redhat/nita-ansible-2.9.18-21.7-1/SOURCES/nita-ansible-2.9.18-21.7/etc/nita-ansible-21.7/remove.sh b/packaging_redhat/nita-ansible-2.9.18-21.7-1/SOURCES/nita-ansible-2.9.18-21.7/etc/nita-ansible-21.7/remove.sh deleted file mode 100755 index e569cc7..0000000 --- a/packaging_redhat/nita-ansible-2.9.18-21.7-1/SOURCES/nita-ansible-2.9.18-21.7/etc/nita-ansible-21.7/remove.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# ******************************************************** -# -# Project: nita-ansible -# -# Copyright (c) Juniper Networks, Inc., 2021. All rights reserved. -# -# Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html -# -# SPDX-License-Identifier: Apache-2.0 -# -# Third-Party Code: This code may depend on other components under separate copyright notice and license terms. Your use of the source code for those components is subject to the terms and conditions of the respective license as noted in the Third-Party source code file. -# -# ******************************************************** - -PACKAGE=nita-ansible-2.9.18 -VERSION=21.7-1 - -# stop the script if a command fails -#set -e -#set -x - -# wait 15 seconds for the containers to exit -sleep 15 - -# remove exited containers: -docker ps --filter status=dead --filter status=exited -aq | xargs -r docker rm -v - -# remove unused volumes: -docker volume ls -qf dangling=true | xargs -r docker volume rm - -# remove docker images -docker rmi -f juniper/nita-ansible:21.7-1 -docker rmi -f juniper/nita-ansible:_nita_release_$VERSION - -# remove unused images -docker images --no-trunc | grep '' | awk '{ print $3 }' | xargs -r docker rmi diff --git a/packaging_redhat/nita-ansible-2.9.18-21.7-1/SPECS/nita-ansible-2.9.18.spec b/packaging_redhat/nita-ansible-2.9.18-21.7-1/SPECS/nita-ansible-2.9.18.spec deleted file mode 100644 index acba0c2..0000000 --- a/packaging_redhat/nita-ansible-2.9.18-21.7-1/SPECS/nita-ansible-2.9.18.spec +++ /dev/null @@ -1,70 +0,0 @@ -# ******************************************************** -# -# Project: nita-ansible -# -# Copyright (c) Juniper Networks, Inc., 2021. All rights reserved. -# -# Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html -# -# SPDX-License-Identifier: Apache-2.0 -# -# Third-Party Code: This code may depend on other components under separate copyright notice and license terms. Your use of the source code for those components is subject to the terms and conditions of the respective license as noted in the Third-Party source code file. -# -# ******************************************************** - -%define __spec_install_post %{nil} -%define debug_package %{nil} -%define __os_install_post %{_dbpath}/brp-compress - -Name: nita-ansible-2.9.18 -Version: 21.7 -Release: 1 -Summary: Network Implementation and Test Automation -Group: Development/Tools -BuildArch: noarch -License: Apache License, Version 2.0, http://www.apache.org/licenses/LICENSE-2.0 -URL: https://www.juniper.net -Source0: %{name}-%{version}.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - -%description -Network Implementation and Test Automation docker-compose based cli/web application for doing provisioning and testing of network hardware and software - -%pre -if [ $(getenforce) != Permissive ]; then echo "****** Please disable SELinux during instalation (setenforce 0) ******"; exit 1; fi - -%prep -%setup -q - -%build -# Empty section. - -%install -rm -rf %{buildroot} -mkdir -p %{buildroot} -# in builddir -cp -a * %{buildroot} - -%clean -rm -rf %{buildroot} - -%post -%{_sysconfdir}/nita-ansible-%{version}/install.sh - -%preun -if [ $(getenforce) != Permissive ]; then echo "****** Please disable SELinux during removal (setenforce 0) ******"; exit 1; fi -%{_sysconfdir}/nita-ansible-%{version}/remove.sh - -%files -%defattr(-,root,root,-) -%{_sysconfdir}/nita-ansible-%{version}/install.sh -%{_sysconfdir}/nita-ansible-%{version}/remove.sh -%{_datadir}/%{name}/* -%{_prefix}/local/bin/* - -%changelog -* Sat Aug 7 2021 Hugo Ribeiro 21.7-1 - - Updated broken dependencies -* Wed Sep 23 2020 Hugo Ribeiro 20.10-1 - - OS Release diff --git a/packaging_redhat/nita-ansible-2.9.18-21.7-1/SRPMS/.gitignore b/packaging_redhat/nita-ansible-2.9.18-21.7-1/SRPMS/.gitignore deleted file mode 100644 index c96a04f..0000000 --- a/packaging_redhat/nita-ansible-2.9.18-21.7-1/SRPMS/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/packaging_redhat/nita-ansible-2.9.18-21.7-1/TMP/.gitignore b/packaging_redhat/nita-ansible-2.9.18-21.7-1/TMP/.gitignore deleted file mode 100644 index c96a04f..0000000 --- a/packaging_redhat/nita-ansible-2.9.18-21.7-1/TMP/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file