Merge "[baro] Create stable branch for Kali release"

diff --git a/gitlab-templates/RTD.gitlab-ci.yml b/gitlab-templates/RTD.gitlab-ci.yml
index 5b838d2..198ed5b 100644 (file)
--- a/gitlab-templates/RTD.gitlab-ci.yml
+++ b/gitlab-templates/RTD.gitlab-ci.yml
@@ -19,10 +19,14 @@
 #
 # Scheduled builds can be enabled when creating a schedule job and
 # specifying DOCS_SCHEDULE = "true" in build variables
+#
+# If extra dependencies are needed for builds they will be installed
+# from the $DOCS_REQUIREMENTS location.
 ---
 variables:
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
   DOCS_DIRECTORY: "docs"
+  DOCS_REQUIREMENTS: "$DOCS_DIRECTORY/requirements.txt"
 
 .docs-cache: &docs-cache
   paths:
@@ -36,8 +40,8 @@ variables:
   - source venv/bin/activate
   - pip install Sphinx
   - |
-    if [ -f "$DOCS_DIRECTORY/requirements.txt" ]; then
-      pip install -r "$DOCS_DIRECTORY/requirements.txt"
+    if [ -f "$DOCS_REQUIREMENTS" ]; then
+      pip install -r "$DOCS_REQUIREMENTS"
     fi
 
 docs-build:
@@ -56,7 +60,7 @@ docs-build:
       when: never
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - $DOCS_DIRECTORY/*
+        - $DOCS_DIRECTORY/**/*
 
 docs-link-check:
   stage: test
@@ -76,7 +80,7 @@ docs-link-check:
       when: never
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - $DOCS_DIRECTORY/*
+        - $DOCS_DIRECTORY/**/*
 
 pages:
   stage: deploy
@@ -92,4 +96,4 @@ pages:
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - $DOCS_DIRECTORY/*
+        - $DOCS_DIRECTORY/**/*

diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index 7ecc02e..2ed9168 100644 (file)
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -80,7 +80,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker pull $image
+          docker pull $image
 
 - builder:
     name: xtesting-pi-run-containers
@@ -89,7 +89,7 @@
           set +x
           volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
           env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
-          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -97,7 +97,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker run --rm \
+          docker run --rm \
             --privileged={privileged} \
             --network={network} \
             $volumes \
@@ -125,7 +125,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker rmi $image || true
+          docker rmi $image || true
 
 - job-template:
     name: 'xtesting-pi-{repo}-{container}-{tag}-pull'
@@ -253,7 +253,7 @@
           set +x
           volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
           env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
-          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -261,7 +261,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker run --rm \
+          docker run --rm \
             $volumes \
             $env \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 389cfd0..4ad16d0 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -80,7 +80,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker pull $image
+          docker pull $image
 
 - builder:
     name: xtesting-run-containers
@@ -89,7 +89,7 @@
           set +x
           volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
           env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
-          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -97,7 +97,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker run --rm \
+          docker run --rm \
             --privileged={privileged} \
             --network={network} \
             $volumes \
@@ -125,7 +125,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker rmi $image || true
+          docker rmi $image || true
 
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-pull'
@@ -241,7 +241,7 @@
           set +x
           volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
           env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
-          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -249,7 +249,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker run --rm \
+          docker run --rm \
             $volumes \
             $env \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
@@ -394,7 +394,7 @@
           if [ "{from}" != "None" ]; then
               sed -i {from} Dockerfile
           fi
-          sudo docker build $build_args \
+          docker build $build_args \
             --pull=false --no-cache --force-rm=true \
             -t $image .
 
@@ -426,7 +426,7 @@
           else
             image=_:/alpine:{dependency}
           fi
-          sudo docker pull $image || true
+          docker pull $image || true
 
 - builder:
     name: xtesting-remove-dep-images
@@ -440,7 +440,7 @@
           else
             image=_:/alpine:{dependency}
           fi
-          sudo docker rmi $image || true
+          docker rmi $image || true
 
 - job-template:
     name: 'xtesting-{repo}-{tag}-dep-pull'
@@ -477,14 +477,14 @@
     builders:
       - shell: |
           set +x
-          sudo apt-get update && sudo apt-get install \
+          apt-get update && apt-get install \
             software-properties-common gpg -y
-          sudo add-apt-repository -y ppa:deadsnakes/ppa
-          sudo apt-get update && sudo apt-get install python3.8 \
+          add-apt-repository -y ppa:deadsnakes/ppa
+          apt-get update && apt-get install python3.8 \
             python3.8-dev python3.8-distutils \
             python3.7 python3.7-dev python3.6 python3.6-dev \
             python python-dev python3-pip enchant -y
-          sudo pip3 install tox tox-pip-version
+          pip3 install tox tox-pip-version
 
           tox
 
@@ -669,7 +669,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker push $image
+          docker push $image
 
 - trigger:
     name: xtesting-commit
@@ -757,9 +757,9 @@
     name: xtesting-trivy
     builders:
       - shell: |
-          sudo apt-get update && sudo apt-get install curl -y
+          apt-get update && apt-get install curl -y
 
-          curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
+          curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b .
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then

diff --git a/releases/kali/airship.yaml b/releases/kali/airship.yaml
new file mode 100644 (file)
index 0000000..6eb5f6f
--- /dev/null
+++ b/releases/kali/airship.yaml
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2020 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: airship
+project-type: installer
+release-model: stable
+
+branches:
+  - name: stable/kali
+    location:
+      airship: 88723e1bb827b0efa57f47cb12d0ff1c1fe7802c
+
+release-notes: http://docs.opnfv.org/en/stable-kali/submodules/airship/docs/release/release-notes/release-notes.html