Skip to content
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

Update sync script #56

Merged
merged 2 commits into from
Feb 15, 2021
Merged

Update sync script #56

merged 2 commits into from
Feb 15, 2021

Conversation

tolusha
Copy link
Contributor

@tolusha tolusha commented Feb 12, 2021

Signed-off-by: Anatolii Bazko abazko@redhat.com

What does this PR do?

Update sync script

What issues does this PR fix or reference?

eclipse-che/che#18022
https://issues.redhat.com/browse/CRW-1589

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
@@ -206,6 +206,11 @@ pushd "${TARGETDIR}" >/dev/null
mkdir -p "${TARGETDIR}/${d%/*}"
sed -r -e "s#DOC_LINK =.+#DOC_LINK = 'https://access.redhat.com/documentation/en-us/red_hat_codeready_workspaces/${CRW_VERSION}/'#" -i "${TARGETDIR}/${d}"
sed -r -e "s#DOC_LINK_RELEASE_NOTES.+#DOC_LINK_RELEASE_NOTES = 'https://access.redhat.com/documentation/en-us/red_hat_codeready_workspaces/${CRW_VERSION}/html/release_notes_and_known_issues/index'#" -i "${TARGETDIR}/${d}"

# Restore replaced upstream project
sed -r -e "s#CHECTL_PROJECT_NAME =.+#CHECTL_PROJECT_NAME = 'chectl'#" -i "${TARGETDIR}/${d}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why does downstream care about upstream chectl?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sync script completely replace chectl on crwctl but we have to check if current project is chectl or downstream one.

@@ -85,8 +85,7 @@ pushd "${SOURCEDIR}" >/dev/null
-e "/ const (minishiftAddonTasks|msAddonTasks) = new MinishiftAddonTasks\(\)/d" \
-e '/.+tasks.add\(helmTasks.+/d' \
-e '/.+tasks.add\((minishiftAddonTasks|msAddonTasks).+/d' \
-e "s|(const DEFAULT_CHE_IMAGE =).+|\1 'registry.redhat.io/codeready-workspaces/server-rhel8:${CRW_SERVER_TAG}'|g" \
Copy link
Member

@nickboldt nickboldt Feb 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DEFAULT_CHE_IMAGE is no longer a property?

DEFAULT_CHE_OPERATOR_IMAGE got renamed and the tag is removed?

asking 2nd question because relevant to CRW-1579 and CRW-1487, re: using :latest tags in crwctl

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need this. That's kind of legacy.
The image must be defined in operator.yaml template.
Here is we just need a image name to check for update task.

@nickboldt nickboldt merged commit bea53b2 into redhat-developer:crw-2.7-rhel-8 Feb 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants