Skip to content

Commit 23368b7

Browse files
committed
(maint) Update source urls to voxpupuli.org
Updates source urls now that openvox packages have switched over officially to being served from voxpupuli.org.
1 parent 18b47e5 commit 23368b7

File tree

6 files changed

+20
-24
lines changed

6 files changed

+20
-24
lines changed

.github/workflows/pr_testing.yaml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ on:
99
branches:
1010
- main
1111

12+
env:
13+
# Environment variables needed when running the task install scripts
14+
# manually.
15+
PT__installdir: ${{ github.workspace }}
16+
PT_apt_source: "https://apt.voxpupuli.org"
17+
PT_yum_source: "https://yum.voxpupuli.org"
18+
1219
jobs:
1320
shellcheck:
1421
runs-on: ubuntu-latest
@@ -70,19 +77,13 @@ jobs:
7077
uses: ./openvox_bootstrap/.github/actions/container_task_prep
7178
- name: Run openvox-agent install task manually
7279
env:
73-
PT__installdir: ${{ github.workspace }}
7480
PT_collection: openvox8
75-
PT_apt_source: "https://apt.overlookinfratech.com"
76-
PT_yum_source: "https://yum.overlookinfratech.com"
7781
run: ./openvox_bootstrap/tasks/install_linux.sh
7882
- name: Verify openvox-agent is installed
7983
run: /opt/puppetlabs/bin/puppet --version | grep -E '8\.[0-9]+'
8084
- name: Verify idempotency
8185
env:
82-
PT__installdir: ${{ github.workspace }}
8386
PT_collection: openvox8
84-
PT_apt_source: "https://apt.overlookinfratech.com"
85-
PT_yum_source: "https://yum.overlookinfratech.com"
8687
run: ./openvox_bootstrap/tasks/install_linux.sh
8788

8889
test-install-version:
@@ -106,17 +107,11 @@ jobs:
106107
uses: ./openvox_bootstrap/.github/actions/container_task_prep
107108
- name: Run openvox-agent install task manually
108109
env:
109-
PT__installdir: ${{ github.workspace }}
110110
PT_version: "8.14.0"
111-
PT_apt_source: "https://apt.overlookinfratech.com"
112-
PT_yum_source: "https://yum.overlookinfratech.com"
113111
run: ./openvox_bootstrap/tasks/install_linux.sh
114112
- name: Verify openvox-agent is installed
115113
run: /opt/puppetlabs/bin/puppet --version | grep '8.14.0'
116114
- name: Verify idempotency
117115
env:
118-
PT__installdir: ${{ github.workspace }}
119116
PT_version: "8.14.0"
120-
PT_apt_source: "https://apt.overlookinfratech.com"
121-
PT_yum_source: "https://yum.overlookinfratech.com"
122117
run: ./openvox_bootstrap/tasks/install_linux.sh

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ bootstrapping installation of the openvox-agent package.
66
Provides some of the functionality of the [puppet_agent::install
77
tasks](https://github.com/puppetlabs/puppetlabs-puppet_agent/tree/main?tab=readme-ov-file#puppet_agentinstall)
88
for [openvox](https://voxpupuli.org/openvox/) packages from
9-
https://apt.overlookinfratech.com, https://yum.overlookinfratech.com.
9+
https://apt.voxpupuli.org, https://yum.voxpupuli.org.
1010

11-
The puppet_agent module makes use of the Perforce repositories instead.
11+
The puppet_agent module makes use of the Perforce repositories and
12+
collections instead.
1213

1314
## Usage
1415

@@ -53,7 +54,7 @@ plugin-hooks:
5354
5455
The openvox_bootstrap::install_build_artifact task is a development
5556
task that can be used to install a build artifact package directly
56-
from the https://artifact.overlookinfratech.com repository for testing
57+
from the https://artifact.voxpupuli.org repository for testing
5758
prior to release.
5859
5960
```sh

tasks/install.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
"apt_source": {
1414
"description": "The apt source repository to retrieve deb packages from.",
1515
"type": "Optional[String]",
16-
"default": "https://apt.overlookinfratech.com"
16+
"default": "https://apt.voxpupuli.org"
1717
},
1818
"yum_source": {
1919
"description": "The yum source repository to retrieve rpm packages from.",
2020
"type": "Optional[String]",
21-
"default": "https://yum.overlookinfratech.com"
21+
"default": "https://yum.voxpupuli.org"
2222
}
2323
},
2424
"implementations": [

tasks/install_build_artifact.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"artifacts_source": {
1414
"description": "URL to the build artifacts server.",
1515
"type": "String[1]",
16-
"default": "https://s3.osuosl.org/openvox-artifacts"
16+
"default": "https://artifacts.voxpupuli.org"
1717
}
1818
},
1919
"implementations": [

tasks/install_build_artifact_linux.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ version=${PT_version}
1010
# shellcheck disable=SC2154
1111
package=${PT_package:-'openvox-agent'}
1212
# shellcheck disable=SC2154
13-
artifacts_source=${PT_artifacts_source:-'https://s3.osuosl.org/openvox-artifacts'}
13+
artifacts_source=${PT_artifacts_source:-'https://artifacts.voxpupuli.org'}
1414

1515
# shellcheck source=files/common.sh
1616
source "${installdir}/openvox_bootstrap/files/common.sh"
@@ -49,14 +49,14 @@ set_architecture() {
4949
# package_url - the url to download the build artifact package
5050
#
5151
# Currently this is based on the structure of the package repository
52-
# at https://artifacts.overlookinfratech.com, which is a page
52+
# at https://artifacts.voxpupuli.org, which is a page
5353
# that provides a summary of links to artifacts contained in an S3
5454
# bucket hosted by Oregon State University Open Source Lab.
5555
#
5656
# Example rpm:
57-
# https://s3.osuosl.org/openvox-artifacts/openvox-agent/8.15.0/openvox-agent-8.15.0-1.el8.aarch64.rpm
57+
# https://artifacts.voxpupuli.org/openvox-agent/8.15.0/openvox-agent-8.15.0-1.el8.x86_64.rpm
5858
# Example deb:
59-
# https://s3.osuosl.org/openvox-artifacts/openvox-agent/8.15.0/openvox-agent_8.15.0-1+debian10_amd64.deb
59+
# https://artifacts.voxpupuli.org/openvox-agent/8.15.0/openvox-agent_8.15.0-1%2Bdebian12_amd64.deb
6060
set_package_url() {
6161
local _platform="$1"
6262
local _package="$2"

tasks/install_linux.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ version=${PT_version:-'latest'}
1010
# shellcheck disable=SC2154
1111
collection=${PT_collection:-'openvox8'}
1212
# shellcheck disable=SC2154
13-
yum_source=${PT_yum_source:-'https://yum.overlookinfratech.com'}
13+
yum_source=${PT_yum_source:-'https://yum.voxpupuli.org'}
1414
# shellcheck disable=SC2154
15-
apt_source=${PT_apt_source:-'https://apt.overlookinfratech.com'}
15+
apt_source=${PT_apt_source:-'https://apt.voxpupuli.org'}
1616

1717
# shellcheck source=files/common.sh
1818
source "${installdir}/openvox_bootstrap/files/common.sh"

0 commit comments

Comments
 (0)