Skewer update

.github/workflows/main.yaml

@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+#
+
 name: main
 on:
   push:
@@ -6,17 +25,23 @@ on:
     - cron: "0 0 * * 0"
 jobs:
   test:
+    strategy:
+      fail-fast: false
+      matrix:
+        skupper-version: [latest, main]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
-      - uses: manusa/actions-setup-minikube@v2.6.0
+      - uses: manusa/actions-setup-minikube@v2.10.0
         with:
-          minikube version: "v1.25.2"
-          kubernetes version: "v1.24.1"
-          github token: ${{ secrets.GITHUB_TOKEN }}
-      - run: curl -f https://skupper.io/install.sh | sh
-      - run: echo "$HOME/.local/bin" >> $GITHUB_PATH
+          minikube version: "v1.32.0"
+          kubernetes version: "v1.29.0"
+          github token: ${{secrets.GITHUB_TOKEN}}
+      - run: curl https://skupper.io/install.sh | bash -s -- --version ${{matrix.skupper-version}}
+      - run: echo "$HOME/.local/bin" >> "$GITHUB_PATH"
       - run: ./plano test
+        env:
+          PLANO_COLOR: 1

.gitignore

@@ -1,2 +1,2 @@
-__pycache__/
 /README.html
+__pycache__/

subrepos/skewer/subrepos/plano/scripts/test-centos-7.dockerfile → .plano.py

@@ -17,14 +17,4 @@
 # under the License.
 #
 
-FROM centos:7
-
-RUN yum -q -y update && yum -q clean all
-
-RUN yum -y install epel-release
-
-RUN yum -y install make python2-pyyaml python36 python36-PyYAML
-
-COPY . /root/plano
-WORKDIR /root/plano
-CMD ["make", "clean", "test", "install", "PREFIX=/usr/local"]
+from skewer.planocommands import *