Browse Source

Merge "airskiff: Install AppArmor in package script"

changes/81/630781/2
Zuul 3 years ago committed by Gerrit Code Review
parent
commit
92d7452a9b
  1. 5
      tools/deployment/airskiff/developer/000-install-packages.sh
  2. 26
      tools/deployment/airskiff/developer/001-enable-apparmor.sh
  3. 7
      tools/gate/playbooks/airskiff-deploy-gate.yaml

5
tools/deployment/airskiff/developer/000-install-packages.sh

@ -19,6 +19,7 @@ set -xe
sudo apt-get update
sudo apt-get install --no-install-recommends -y \
apparmor \
ca-certificates \
git \
make \
@ -42,6 +43,10 @@ sudo apt-add-repository \
sudo apt-get update
sudo apt-get install --no-install-recommends -y docker-ce
# Enable apparmor
sudo systemctl enable apparmor
sudo systemctl start apparmor
# Add $USER to docker group
# NOTE: This requires re-authentication. Restart your shell.
sudo adduser "$(whoami)" docker

26
tools/deployment/airskiff/developer/001-enable-apparmor.sh

@ -1,26 +0,0 @@
#!/bin/bash
# Copyright 2017 The Openstack-Helm Authors.
# Copyright 2018 AT&T Intellectual Property. All other rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
set -xe
sudo apt-get update
sudo apt-get install --no-install-recommends -y \
apparmor
sudo systemctl enable apparmor
sudo systemctl start apparmor
sudo systemctl status apparmor.service

7
tools/gate/playbooks/airskiff-deploy-gate.yaml

@ -21,13 +21,6 @@
chdir: "{{ zuul.project.src_dir }}"
become: yes
- name: Enable apparmor
shell: |
./tools/deployment/airskiff/developer/001-enable-apparmor.sh
args:
chdir: "{{ zuul.project.src_dir }}"
become: yes
- name: Build Armada
shell: |
make images

Loading…
Cancel
Save