-
-
Notifications
You must be signed in to change notification settings - Fork 269
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(publish.sh): use dedicated source folder for httpd service including only .htaccess files #777
Merged
dduportal
merged 1 commit into
jenkins-infra:master
from
lemeurherve:helpdesk2649-dedicated-www4-for-httpd
Jul 11, 2024
Merged
feat(publish.sh): use dedicated source folder for httpd service including only .htaccess files #777
dduportal
merged 1 commit into
jenkins-infra:master
from
lemeurherve:helpdesk2649-dedicated-www4-for-httpd
Jul 11, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lemeurherve
changed the title
chore(publish.sh): use dedicated
chore(publish.sh): use dedicated source folder for httpd service including only .htaccess files
Apr 26, 2024
www4
for httpd service including only .htacess files
lemeurherve
changed the title
chore(publish.sh): use dedicated source folder for httpd service including only .htaccess files
feat(publish.sh): use dedicated source folder for httpd service including only .htaccess files
May 3, 2024
dduportal
reviewed
May 3, 2024
dduportal
reviewed
May 3, 2024
dduportal
pushed a commit
to jenkins-infra/azure
that referenced
this pull request
May 10, 2024
…r env files to access file shares (#690) This PR adds an output with a command to generate a zip containing two env files: - .env-content for updates-jenkins-io File Share - .env-redirections for updates-jenkins-io-httpd File Share This zip file has to be uploaded as zip credentials on trusted.ci.jenkins.io for the update-center2/site/publish.sh script to work. Ref: - jenkins-infra/update-center2#777 - jenkins-infra/helpdesk#2649
lemeurherve
added a commit
that referenced
this pull request
May 10, 2024
dduportal
reviewed
May 13, 2024
dduportal
reviewed
May 13, 2024
dduportal
reviewed
May 13, 2024
Update: I'm working on this PR, with local runs in the permanent agent |
dduportal
force-pushed
the
helpdesk2649-dedicated-www4-for-httpd
branch
from
May 24, 2024 12:46
18c7a91
to
c17011d
Compare
Update:
|
This was referenced May 25, 2024
dduportal
added a commit
to jenkins-infra/azure
that referenced
this pull request
May 30, 2024
Related to jenkins-infra/helpdesk#2649 and blocking jenkins-infra/update-center2#784 and jenkins-infra/charts-secrets#30 This PR simplifies and rename outputs to ensure the script used to generate the Update Center credential ZIP file in jenkins-infra/charts-secrets#30 can extract the proper output with the naming convention from jenkins-infra/update-center2#777 and jenkins-infra/update-center2#784 (`www-content` and `www-redirections`). - It avoids multiple levels of escaping challenges (current output requires 3 levels of escaping: in HCL syntax AND in shell syntax for the initial call AND on shell syntax in the file template itself) - The only "coupling" in Terraform HCL is the output name which is an acceptable contract: it avoid having to change things in the terraform state when only renaming a variable - No more risk to have a local env file committed by error and exposing the secrets --------- Signed-off-by: Damien Duportal <[email protected]>
dduportal
force-pushed
the
helpdesk2649-dedicated-www4-for-httpd
branch
from
July 11, 2024 13:54
c17011d
to
aa68205
Compare
…infra#789) Signed-off-by: Damien Duportal <[email protected]> Signed-off-by: Hervé Le Meur <[email protected]>
dduportal
force-pushed
the
helpdesk2649-dedicated-www4-for-httpd
branch
from
July 11, 2024 13:55
aa68205
to
a19a03f
Compare
Update:
|
dduportal
approved these changes
Jul 11, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested with success in a team pair session in trusted.ci.jenkins.io (same method as #789)
Copy took 2s (it was an incremental one).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ref. jenkins-infra/helpdesk#2649
Blocked by jenkins-infra/pipeline-library#854
This PR allows using a dedicated volume for httpd service:
www-content
&www-redirections
sources created with a filtered rsync copy fromwww2
updates-jenkins-io-httpd
file share, in the same storage account asupdates-jenkins-io
file share used for mirrorbits servicehttpd
fallback redirection to mirrors [new UC] #776 to allow patching only content inwww-redirections
www-content
which doesn't contain any .htaccess file as they don't need/can't use/shouldn't have access to themIt will requires some job config changes: new file share service principal credentials on trusted, and adapt some variable names of the existing one.
Will prepare something to try out in our dedicated test folder https://trusted.ci.jenkins.io:1443/job/update_center_test_lemeurherve_helpdesk2649/, I'll let you know before doing anything on trusted.ci.jenkins.io
WIP in draft to share what I'm working on, not for immediate review.