Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ variables:
# older versions of git have issues fetching.
GIT_STRATEGY: clone
OOD_PACKAGING_DEBUG: 'true'
OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand.sec
OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand-sha512.sec
OOD_PACKAGING_GPG_PASSPHRASE: /systems/osc_certs/gpg/ondemand/.gpgpass

before_script:
Expand All @@ -22,7 +22,9 @@ rpm-build:
- ./tmp/ondemand-packaging/bin/ood_packaging -w $CI_PROJECT_DIR/tmp/work -o $CI_PROJECT_DIR/tmp/output -V $CI_COMMIT_TAG -T $CI_PROJECT_DIR
parallel:
matrix:
- OOD_PACKAGING_DIST: [el7, el8]
- OOD_PACKAGING_DIST: [el8]
OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand.sec
- OOD_PACKAGING_DIST: [el9]
artifacts:
paths:
- tmp/output
Expand Down
6 changes: 0 additions & 6 deletions form.js

This file was deleted.

1 change: 1 addition & 0 deletions form.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ attributes:
label: "Codeserver Version"
options:
- ["4.19", "4.19.1"]
- ["4.22.1", "4.22.1"]
bc_num_hours:
value: 1
min: 1
Expand Down
2 changes: 0 additions & 2 deletions info.md.erb

This file was deleted.

1 change: 0 additions & 1 deletion template/before.sh.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ export host="${host}"
# Generate SHA1 encrypted password (requires OpenSSL installed)
export password="$(create_passwd 16)"

export code_server_version="<%= context.version %>"
3 changes: 1 addition & 2 deletions template/script.sh.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ mkdir -p "$CODE_SERVER_DATAROOT/extensions"
export PASSWORD="$password"

# Print compute node.
echo "$(date): Running on compute node ${compute_node}:$port"
echo "$(date): Running on compute node $(hostname):$port"

# VSCode complains that system git is too old.
module load code-server/<%= code_server_version %>
module li

Expand Down