Skip to content

Commit d4b1130

Browse files
committed
Warning that RPM install won't work on interactive PR
Add the sed -ie 's/restrict_network_access: false/restrict_network_access: true/' directions to the script output. This means the RPM upload won't work because the undercluster won't have network access Added a warning to script & docs about this Signed-off-by: Tom Buskey <tbuskey@redhat.com>
1 parent 4d40735 commit d4b1130

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

ci-operator/step-registry/sandboxed-containers-operator/create-prowjob/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
The `sandboxed-containers-operator-create-prowjob-commands.sh` script creates prowjob configuration files. These prowjobs contain variations of provider/workload combinations. We will start with [Creating Prowjobs](#creating-prowjobs) and [Running Prowjobs](#running-prowjobs). More detail starts in [General Usage](#general-usage).
88

99
## Creating Prowjobs
10-
`sandboxed-containers-operator-create-prowjob-commands.sh update_templates` regenerates all exising prowjobs with the script defaults, These jobs are used directly by Konflux. It is preferred to make all changes in the script and not make changes in existing prowjobs. Also see [Update Templates](#update-templates)
10+
`sandboxed-containers-operator-create-prowjob-commands.sh update_templates` regenerates all exising prowjobs with the script defaults, these jobs are used directly by Konflux. It is preferred to make all changes in the script and not make changes in existing prowjobs. Also see [Update Templates](#update-templates)
1111

1212
`sandboxed-containers-operator-create-prowjob-commands.sh create` creates a yaml file in the current directory. Environment variables alter the yaml output. `create` is used by `update_templates` also.
1313

@@ -32,6 +32,8 @@ sandboxed-containers-operator-create-prowjob-commands.sh run <YAMLFILE> <PROVIDE
3232
```bash
3333
sed -ie 's/restrict_network_access: false/restrict_network_access: true/ ' YAMLFILE
3434
```
35+
**NOTE: this will prevent the RPM upload if you need to install one!** You will need to upload the RPM to the nodes and install them after the kataconfig is installed. It will also make the automated tests invalid
36+
3537
4. Now follow the directions to mv the file, add to git, run make commands
3638
5. `git status -uno` and git add any changed files
3739
6. `git commit -m '[DEBUG] [DO NOT MERGE]'`

ci-operator/step-registry/sandboxed-containers-operator/create-prowjob/sandboxed-containers-operator-create-prowjob-commands.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@ validate_and_set_defaults() {
194194
fi
195195
}
196196

197-
# Function to show usage
198-
# Continuation indent = length(MUST_GATHER_ON_FAILURE_ONLY) + 1 = 28 spaces
197+
199198
show_usage() {
200199
echo "Usage: $0 <command>"
201200
echo ""
@@ -490,17 +489,22 @@ EOF
490489
echo "Option B - Submit configuration to CI:"
491490
echo "1. Review the created configuration file:"
492491
echo " cat ${OUTPUT_FILE}"
492+
echo "2. Modify the file to allow "
493+
echo " sed -ie 's/restrict_network_access: false/restrict_network_access: true/ ' ${OUTPUT_FILE}"
494+
echo "**NOTE: this will prevent the RPM upload if you need to install one!**"
495+
echo "You will need to upload the RPM to the nodes and install them after the kataconfig is installed."
496+
echo "It will also make the automated tests invalid"
493497
echo ""
494-
echo "2. Move it to the appropriate directory:"
498+
echo "3. Move it to the appropriate directory:"
495499
echo "mv ${OUTPUT_FILE} ci-operator/config/openshift/sandboxed-containers-operator/"
496500
echo ""
497-
echo "3. Add to git:"
501+
echo "4. Add to git:"
498502
echo "git add ci-operator/config/openshift/sandboxed-containers-operator/${OUTPUT_FILE}"
499503
echo ""
500-
echo "4. Generate and update CI configuration before creating PR:"
504+
echo "5. Generate and update CI configuration before creating PR:"
501505
echo "make ci-operator-config && make registry-metadata && make prow-config && make jobs && make update"
502506
echo ""
503-
echo "5. git add changes, commit and push to PR"
507+
echo "6. git add changes, commit and push to PR"
504508
echo ""
505509
}
506510

0 commit comments

Comments
 (0)