Update Skewer

.plano.py

@@ -0,0 +1,20 @@
+#
+# 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.
+#
+
+from skewer.planocommands import *

external/skewer-main/README.md

@@ -21,26 +21,28 @@ use the [Skupper example template][template] as a starting point.
 
 [template]: https://github.com/skupperproject/skupper-example-template
 
-Add the Skewer code as a subdirectory in your example project:
+Change directory to the root of your example project:
 
     cd <project-dir>/
+
+Add the Skewer code as a subdirectory in your example project:
+
     mkdir -p external
     curl -sfL https://github.com/skupperproject/skewer/archive/main.tar.gz | tar -C external -xz
 
-Symlink the Skewer library into your `python` directory:
+Symlink the Skewer and Plano libraries into your `python` directory:
 
     mkdir -p python
     ln -s ../external/skewer-main/python/skewer python/skewer
+    ln -s ../external/skewer-main/python/plano python/plano
 
-Symlink the `plano` command into the root of your project.  Symlink
-the standard `.plano.py` and `.gitignore` files as well.
+Copy the `plano` command into the root of your project:
 
-    ln -s external/skewer-main/plano
-    ln -s external/skewer-main/config/.plano.py
+    cp external/skewer-main/plano plano
 
-Copy the standard `.gitignore` and GitHub Actions workflow file into
-your project:
+Copy the standard config files and workflow file into your project:
 
+    cp external/skewer-main/config/.plano.py .plano.py
     cp external/skewer-main/config/.gitignore .gitignore
 
     mkdir -p .github/workflows

external/skewer-main/external/plano-main/bin/plano

@@ -18,12 +18,9 @@
 # under the License.
 #
 
-import os
 import sys
 
-if os.path.islink(__file__):
-    repo_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-    sys.path.insert(0, os.path.join(repo_dir, "src"))
+sys.path.insert(0, "python")
 
 from plano import PlanoCommand
 

external/skewer-main/external/plano-main/bin/plano-test

@@ -18,12 +18,9 @@
 # under the License.
 #
 
-import os
 import sys
 
-if os.path.islink(__file__):
-    repo_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-    sys.path.insert(0, os.path.join(repo_dir, "src"))
+sys.path.insert(0, "python")
 
 from plano import PlanoTestCommand
 

external/skewer-main/plano

@@ -0,0 +1,28 @@
+#!/usr/bin/python3
+#
+# 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.
+#
+
+import sys
+
+sys.path.insert(0, "python")
+
+from plano import PlanoCommand
+
+if __name__ == "__main__":
+    PlanoCommand().main()

external/skewer-main/python/skewer/main.py

@@ -275,6 +275,8 @@ def run_step(skewer_data, step_data, check=True):
                     await_console_ok()
 
 def pause_for_demo(skewer_data):
+    notice("Pausing for demo time")
+
     sites = list(get_sites(skewer_data))
     frontend_url = None
 

external/skewer-main/test-example/.plano.py

@@ -0,0 +1,20 @@
+#
+# 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.
+#
+
+from skewer.planocommands import *

external/skewer-main/test-example/plano

@@ -0,0 +1,28 @@
+#!/usr/bin/python3
+#
+# 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.
+#
+
+import sys
+
+sys.path.insert(0, "python")
+
+from plano import PlanoCommand
+
+if __name__ == "__main__":
+    PlanoCommand().main()

external/skewer-main/test-example/python/plano

@@ -0,0 +1 @@
+../external/skewer-main/python/plano

plano

@@ -0,0 +1,28 @@
+#!/usr/bin/python3
+#
+# 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.
+#
+
+import sys
+
+sys.path.insert(0, "python")
+
+from plano import PlanoCommand
+
+if __name__ == "__main__":
+    PlanoCommand().main()

python/plano

@@ -0,0 +1 @@
+../external/skewer-main/python/plano