Rsarwad move s1ap state ctx

.dockerignore

@@ -1,6 +1,5 @@
 *
 !.cache/test_certs
-!fb/config/
 
 !.devcontainer/
 !third_party/
@@ -29,12 +28,6 @@
 !lte/gateway/deploy
 !lte/gateway/docker/deploy
 
-!devmand/cloud/
-!devmand/gateway/
-!devmand/protos/
-
-!fb/src/dpi/
-
 !orc8r/cloud/configs/
 !orc8r/lib/
 !orc8r/cloud/go/

.github/workflows/agw-workflow.yml

@@ -28,8 +28,9 @@ concurrency:
 
 env:
   DEVCONTAINER_IMAGE: "ghcr.io/magma/magma/devcontainer:latest"
-  BAZEL_BASE_IMAGE: "ghcr.io/magma/magma/bazel-base:sha-4a878d8"
-  CACHE_KEY: bazel-base-image
+  BAZEL_BASE_IMAGE: "ghcr.io/magma/magma/bazel-base:latest"
+  # see GH14041
+  CACHE_KEY: bazel-base-image-sha-c4de1e5
   REMOTE_DOWNLOAD_OPTIMIZATION: true
 
 jobs:

.github/workflows/bazel.yml

@@ -23,8 +23,9 @@ on:
       - master
 
 env:
-  BAZEL_BASE_IMAGE: "ghcr.io/magma/magma/bazel-base:sha-4a878d8"
-  CACHE_KEY: bazel-base-image
+  BAZEL_BASE_IMAGE: "ghcr.io/magma/magma/bazel-base:latest"
+  # see GH14041
+  CACHE_KEY: bazel-base-image-sha-c4de1e5
   REMOTE_DOWNLOAD_OPTIMIZATION: true
 
 concurrency:

.github/workflows/build_all.yml

@@ -115,6 +115,7 @@ jobs:
     runs-on: macos-12
     outputs:
       artifacts: ${{ steps.publish_packages.outputs.artifacts }}
+      magma_package: ${{ steps.publish_packages.outputs.magma_package }}
     steps:
       - uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # pin@v2
         with:
@@ -179,6 +180,14 @@ jobs:
             if [[ "$HTTP_STATUS" != "2"* ]]; then
               PUBLISH_ERROR="true"
             fi
+            # extract magma debian package version
+            match="magma_[0-9]+\.[0-9]+\.[0-9]+-[0-9]+-[a-z0-9]+_[a-z0-9]+.deb"
+            if [[ $i =~ $match ]]; then
+              magma_package=${i#magma_}
+              magma_package=${magma_package%_[a-z0-9]*.deb}
+              magma_package='magma='${magma_package}
+              echo "::set-output name=magma_package::${magma_package}"
+            fi
           done
           # set output
           if [[ "$PUBLISH_ERROR" != "true" ]]; then
@@ -991,3 +1000,15 @@ jobs:
           SLACK_ICON_EMOJI: ":heavy_check_mark:"
           SLACK_COLOR: "#00FF00"
           SLACK_FOOTER: ' '
+  trigger-debian-integ-test:
+    if: always() && github.event_name == 'push' && github.repository_owner == 'magma' && github.ref == 'refs/heads/master'
+    runs-on: ubuntu-latest
+    needs: agw-build
+    steps:
+      - name: Trigger debian integ test workflow
+        uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          repository: magma/magma
+          event-type: build-all-artifact
+          client-payload: '{ "artifact": "${{ needs.agw-build.outputs.magma_package }}" }'

.github/workflows/docker-promote.yml

@@ -0,0 +1,53 @@
+# Copyright 2022 The Magma Authors.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+#
+# 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.
+
+name: docker promote
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch_tag:
+        description: 'Branch version number'
+        required: true
+      release_tag:
+        description: 'Release version number'
+        required: true
+
+jobs:
+  docker-promote:
+    runs-on: ubuntu-latest
+    env:
+      BRANCH_TAG: ${{ inputs.branch_tag }}
+      RELEASE_TAG: ${{ inputs.release_tag }}
+      MAGMA_ARTIFACTORY: artifactory.magmacore.org
+    steps:
+      - uses: tspascoal/get-user-teams-membership@533553aa88900a17c59177d65bcf8c5c97ff1a90 # [email protected]
+        name: Check if user has rights to promote
+        id: checkUserMember
+        with:
+          username: ${{ github.actor }}
+          team: 'approvers-ci'
+          GITHUB_TOKEN: ${{ secrets.github_token }}
+      - if: ${{ steps.checkUserMember.outputs.isTeamMember == 'false' }}
+        run: |
+          echo "User is not a member of the team"
+          exit 1
+      - uses: docker/login-action@49ed152c8eca782a232dede0303416e8f356c37b # Pin v2.0.0
+        name: Login to Artifactory
+        with:
+          registry: docker.${{ env.MAGMA_ARTIFACTORY }}
+          username: ${{ secrets.ARTIFACTORY_USERNAME }}
+          password: ${{ secrets.ARTIFACTORY_PASSWORD }}
+      - run: |
+          wget https://github.com/magma/magma/raw/master/orc8r/tools/docker/promote.sh
+          chmod 755 promote.sh
+          # Promote Docker images
+          ./promote.sh

.github/workflows/gcc-problems.yml

@@ -26,8 +26,9 @@ on:
       - master
       - 'v1.*'
 env:
-  BAZEL_BASE_IMAGE: "ghcr.io/magma/magma/bazel-base:sha-4a878d8"
-  CACHE_KEY: bazel-base-image
+  BAZEL_BASE_IMAGE: "ghcr.io/magma/magma/bazel-base:latest"
+  # see GH14041
+  CACHE_KEY: bazel-base-image-sha-c4de1e5
   REMOTE_DOWNLOAD_OPTIMIZATION: true
 
 concurrency:

.github/workflows/helm-promote.yml

@@ -0,0 +1,49 @@
+# Copyright 2022 The Magma Authors.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+#
+# 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.
+
+name: helm promote
+
+on:
+  workflow_dispatch:
+    inputs:
+      magma_version:
+        description: 'Magma version number'
+        required: true
+
+jobs:
+  helm-promote:
+    runs-on: ubuntu-latest
+    env:
+      MAGMA_VERSION: ${{ inputs.magma_version }}
+      MAGMA_ARTIFACTORY: https://artifactory.magmacore.org:443/artifactory
+      HELM_CHART_MUSEUM_TOKEN: ${{ secrets.HELM_CHART_MUSEUM_TOKEN }}
+      HELM_CHART_MUSEUM_USERNAME: ${{ secrets.HELM_CHART_MUSEUM_USERNAME }}
+    steps:
+      - uses: tspascoal/get-user-teams-membership@533553aa88900a17c59177d65bcf8c5c97ff1a90 # [email protected]
+        name: Check if user has rights to promote
+        id: checkUserMember
+        with:
+          username: ${{ github.actor }}
+          team: 'approvers-ci'
+          GITHUB_TOKEN: ${{ secrets.github_token }}
+      - if: ${{ steps.checkUserMember.outputs.isTeamMember == 'false' }}
+        run: |
+          echo "User is not a member of the team"
+          exit 1
+      - run: |
+          wget https://github.com/magma/magma/raw/master/orc8r/tools/helm/promote.sh
+          chmod 755 promote.sh
+          # Promote Helm charts
+          ./promote.sh orc8r-${MAGMA_VERSION}.tgz
+          ./promote.sh cwf-orc8r-${MAGMA_VERSION}.tgz
+          ./promote.sh feg-orc8r-${MAGMA_VERSION}.tgz
+          ./promote.sh lte-orc8r-${MAGMA_VERSION}.tgz
+          ./promote.sh domain-proxy-${MAGMA_VERSION}.tgz

.github/workflows/lte-integ-test-bazel.yml

@@ -78,9 +78,7 @@ jobs:
         run: |
           cd lte/gateway
           vagrant ssh -c 'cd ~/magma; bazel/scripts/remote_cache_bazelrc_setup.sh "${{ env.CACHE_KEY }}" "${{ env.REMOTE_DOWNLOAD_OPTIMIZATION }}" "${{ secrets.BAZEL_REMOTE_PASSWORD }}";' magma
-          vagrant ssh -c 'sudo sed -i "s@#precedence ::ffff:0:0/96  100@precedence ::ffff:0:0/96  100@" /etc/gai.conf;' magma
           vagrant ssh -c 'cd ~/magma; bazel build --profile=bazel_profile_lte_integ_tests `bazel query "kind(.*_binary, //orc8r/... union //lte/... union //feg/...)"`;' magma
-          vagrant ssh -c 'sudo sed -i "s@precedence ::ffff:0:0/96  100@#precedence ::ffff:0:0/96  100@" /etc/gai.conf;' magma
       - name: Linking bazel-built script executables to '/usr/local/bin/'
         run: |
           cd lte/gateway

.github/workflows/lte-integ-test-containerized.yml

@@ -0,0 +1,65 @@
+# Copyright 2022 The Magma Authors.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+#
+# 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.
+
+name: LTE integ test containerized AGW
+
+on:
+  workflow_dispatch: null
+  workflow_run:
+    workflows:
+      - build-all
+    branches:
+      - master
+    types:
+      - completed
+
+jobs:
+  lte-integ-test-containerized:
+    if: github.event.workflow_run.conclusion == 'success' && (github.repository_owner == 'magma' || github.event_name == 'workflow_dispatch')
+    runs-on: macos-12
+    steps:
+      - name: Cache magma-dev-box
+        uses: actions/cache@0865c47f36e68161719c5b124609996bb5c40129 # pin@v3
+        with:
+          path: ~/.vagrant.d/boxes/magmacore-VAGRANTSLASH-magma_dev
+          key: vagrant-box-magma-dev-v1.2.20220801
+      - name: Cache magma-test-box
+        uses: actions/cache@0865c47f36e68161719c5b124609996bb5c40129 # pin@v3
+        with:
+          path: ~/.vagrant.d/boxes/magmacore-VAGRANTSLASH-magma_test
+          key: vagrant-box-magma-test
+      - name: Cache magma-trfserver-box
+        uses: actions/cache@0865c47f36e68161719c5b124609996bb5c40129 # pin@v3
+        with:
+          path: ~/.vagrant.d/boxes/magmacore-VAGRANTSLASH-magma_trfserver
+          key: vagrant-box-magma-trfserver-v20220722
+      - uses: actions/setup-python@7f80679172b057fc5e90d70d197929d454754a5a # pin@v2
+        with:
+          python-version: '3.8.10'
+      - name: Install pre requisites
+        run: |
+          pip3 install --upgrade pip
+          pip3 install ansible fabric3 jsonpickle requests PyYAML
+          vagrant plugin install vagrant-vbguest vagrant-disksize vagrant-reload
+      - name: Open up network interfaces for VM
+        run: |
+          sudo mkdir -p /etc/vbox/
+          echo '* 192.168.0.0/16' | sudo tee /etc/vbox/networks.conf
+          echo '* 3001::/64' | sudo tee -a /etc/vbox/networks.conf
+      - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # pin@v3
+      - name: Run the integration test
+        env:
+          DOCKER_REGISTRY: docker-ci.artifactory.magmacore.org/
+          MAGMA_DEV_CPUS: 3
+          MAGMA_DEV_MEMORY_MB: 9216
+        working-directory: lte/gateway
+        run: |
+          fab --show=debug --set DOCKER_REGISTRY=${DOCKER_REGISTRY} integ_test_containerized

.github/workflows/lte-integ-test-magma-deb.yml

@@ -13,13 +13,8 @@ name: LTE integ test magma-deb
 
 on:
   workflow_dispatch: null
-  workflow_run:
-    workflows:
-      - build-all
-    branches:
-      - master
-    types:
-      - completed
+  repository_dispatch:
+    types: [build-all-artifact]
 
 jobs:
   lte-integ-test-magma-deb:
@@ -30,7 +25,7 @@ jobs:
       - name: Cache magma-deb-box
         uses: actions/cache@0865c47f36e68161719c5b124609996bb5c40129 # pin@v3
         with:
-          path: ~/.vagrant.d/boxes/magmacore-VAGRANTSLASH-magma_deb
+          path: ~/.vagrant.d/boxes/ubuntu-VAGRANTSLASH-focal64
           key: vagrant-box-magma-deb-focal64-20220804.0.0
       - name: Cache magma-test-box
         uses: actions/cache@0865c47f36e68161719c5b124609996bb5c40129 # pin@v3
@@ -59,6 +54,7 @@ jobs:
         env:
           MAGMA_DEV_CPUS: 3
           MAGMA_DEV_MEMORY_MB: 9216
+          MAGMA_PACKAGE: ${{ github.event.client_payload.artifact }}
         run: |
           cd lte/gateway
           fab integ_test_deb_installation

cwf/gateway/deploy/roles/cwag/tasks/main.yml

@@ -63,7 +63,7 @@
   sysctl: name="net.ipv4.ip_forward" value=1 sysctl_set=yes state=present reload=yes
 
 - name: Configure Debian interfaces
-  when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
+  when: ansible_distribution == 'Ubuntu'
   block:
     - name: Add static IP to cwag_br0
       become: true

cwf/gateway/deploy/roles/ovs/tasks/main.yml

@@ -11,7 +11,7 @@
 # limitations under the License.
 
 - name: Install openvswitch and dependencies
-  when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
+  when: ansible_distribution == 'Ubuntu'
   include_tasks: debian.yml
 
 - name: Install openvswitch and dependencies

cwf/gateway/docker/c/Dockerfile

@@ -17,7 +17,6 @@
 
 ARG OS_DIST=ubuntu OS_RELEASE=focal EXTRA_REPO=https://artifactory.magmacore.org/artifactory/debian-test
 
-# Stretch is required for c build
 FROM $OS_DIST:$OS_RELEASE AS builder
 ARG OS_DIST OS_RELEASE EXTRA_REPO