diff --git a/doc/source/airskiff.rst b/doc/source/airskiff.rst index 862d6fb40..7f8f18251 100644 --- a/doc/source/airskiff.rst +++ b/doc/source/airskiff.rst @@ -90,6 +90,19 @@ Alternatively, this step can be performed by running the script directly: ./tools/deployment/airskiff/developer/000-clone-dependencies.sh +Setup AppArmor +~~~~~~~~~~~~~~ + +.. literalinclude:: ../../tools/deployment/airskiff/developer/009-setup-apparmor.sh + :language: shell + :lines: 1,18- + +Alternatively, this step can be performed by running the script directly: + +.. code-block:: shell + + ./tools/deployment/airskiff/developer/009-setup-apparmor.sh + Deploy Kubernetes with Minikube ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -103,19 +116,6 @@ Alternatively, this step can be performed by running the script directly: ./tools/deployment/airskiff/developer/010-deploy-k8s.sh -Setup AppArmor -~~~~~~~~~~~~~~ - -.. literalinclude:: ../../tools/deployment/airskiff/developer/015-setup-apparmor.sh - :language: shell - :lines: 1,18- - -Alternatively, this step can be performed by running the script directly: - -.. code-block:: shell - - ./tools/deployment/airskiff/developer/015-setup-apparmor.sh - Restart your shell session ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tools/deployment/airskiff/developer/015-setup-apparmor.sh b/tools/deployment/airskiff/developer/009-setup-apparmor.sh similarity index 100% rename from tools/deployment/airskiff/developer/015-setup-apparmor.sh rename to tools/deployment/airskiff/developer/009-setup-apparmor.sh diff --git a/tools/gate/playbooks/airskiff-deploy-gate.yaml b/tools/gate/playbooks/airskiff-deploy-gate.yaml index 86e30ff2c..c037b5b33 100644 --- a/tools/gate/playbooks/airskiff-deploy-gate.yaml +++ b/tools/gate/playbooks/airskiff-deploy-gate.yaml @@ -30,15 +30,15 @@ args: chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Kubernetes with Minikube + - name: Setup AppArmor shell: | - ./tools/deployment/airskiff/developer/010-deploy-k8s.sh + ./tools/deployment/airskiff/developer/009-setup-apparmor.sh args: chdir: "{{ zuul.project.src_dir }}" - - name: Setup AppArmor + - name: Deploy Kubernetes with Minikube shell: | - ./tools/deployment/airskiff/developer/015-setup-apparmor.sh + ./tools/deployment/airskiff/developer/010-deploy-k8s.sh args: chdir: "{{ zuul.project.src_dir }}"